Skip to content

Commit 1ff0420

Browse files
committed
fix AssetMapper usage without assets enabled
1 parent c1d1cb0 commit 1ff0420

File tree

5 files changed

+46
-0
lines changed

5 files changed

+46
-0
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,6 +1334,10 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
13341334
{
13351335
$loader->load('asset_mapper.php');
13361336

1337+
if (!$assetEnabled) {
1338+
$container->removeDefinition('asset_mapper.asset_package');
1339+
}
1340+
13371341
if (!$httpClientEnabled) {
13381342
$container->register('asset_mapper.http_client', HttpClientInterface::class)
13391343
->addTag('container.error')
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', [
4+
'annotations' => false,
5+
'asset_mapper' => null,
6+
'assets' => false,
7+
'handle_all_throwables' => true,
8+
'http_method_override' => false,
9+
'php_errors' => ['log' => true],
10+
]);
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" ?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:framework="http://symfony.com/schema/dic/symfony"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
6+
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
7+
8+
<framework:config http-method-override="false" handle-all-throwables="true">
9+
<framework:annotations enabled="false" />
10+
<framework:asset-mapper enabled="true" />
11+
<framework:assets enabled="false" />
12+
<framework:php-errors log="true" />
13+
</framework:config>
14+
</container>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
framework:
2+
annotations: false
3+
asset_mapper: ~
4+
assets: false
5+
handle_all_throwables: true
6+
http_method_override: false
7+
php_errors:
8+
log: true

Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2386,6 +2386,16 @@ public function testWebhookWithoutSerializer()
23862386
);
23872387
}
23882388

2389+
public function testAssetMapperWithoutAssets()
2390+
{
2391+
$container = $this->createContainerFromFile('asset_mapper_without_assets');
2392+
2393+
$this->assertTrue($container->has('asset_mapper'));
2394+
$this->assertFalse($container->has('asset_mapper.asset_package'));
2395+
$this->assertFalse($container->has('assets.packages'));
2396+
$this->assertFalse($container->has('assets._default_package'));
2397+
}
2398+
23892399
protected function createContainer(array $data = [])
23902400
{
23912401
return new ContainerBuilder(new EnvPlaceholderParameterBag(array_merge([

0 commit comments

Comments
 (0)