8000 [FrameworkBundle] fix assets and templating tests · symfony/symfony@293df5d · GitHub
[go: up one dir, main page]
Skip to content

Commit 293df5d

Browse files
xabbuhxabbuh
committed
[FrameworkBundle] fix assets and templating tests
Now that the `assets` section is automatically enabled when `templating` is enabled (see #17506), the `templating.helper.assets` will also be present as soon as the `templating` section is activated.
1 parent 415bab9 commit 293df5d

File tree

5 files changed

+10
-30
lines changed

5 files changed

+10
-30
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -547,11 +547,7 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
547547
'Symfony\\Bundle\\FrameworkBundle\\Templating\\< 8000 span class=pl-s>Loader\\FilesystemLoader',
548548
));
549549

550-
if ($container->hasDefinition('assets.packages')) {
551-
$container->getDefinition('templating.helper.assets')->replaceArgument(0, new Reference('assets.packages'));
552-
} else {
553-
$container->removeDefinition('templating.helper.assets');
554-
}
550+
$container->getDefinition('templating.helper.assets')->replaceArgument(0, new Reference('assets.packages'));
555551
}
556552
}
557553

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.php

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets_disabled.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/assets_disabled.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,15 @@ public function testAssetHelperWhenAssetsAreEnabled()
438438

439439
public function testAssetHelperWhenTemplatesAreEnabledAndAssetsAreDisabled()
440440
{
441-
$container = $this->createContainerFromFile('assets_disabled');
441+
$container = $this->createContainerFromFile('full');
442+
$packages = $container->getDefinition('templating.helper.assets')->getArgument(0);
443+
444+
$this->assertSame('assets.packages', (string) $packages);
445+
}
446+
447+
public function testAssetHelperWhenAssetsAndTemplatesAreDisabled()
448+
{
449+
$container = $this->createContainerFromFile('default_config');
442450

443451
$this->assertFalse($container->hasDefinition('templating.helper.assets'));
444452
}

0 commit comments

Comments
 (0)
0