bug #14419 inject asset packages in assets helper service (xabbuh)

fabpot · fabpot · commit b66a713fed79 · 2015-04-21T07:37:05.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- inject asset packages in assets helper service | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #14368 | License | MIT | Doc PR | Commits ------- 6928507 inject asset packages in assets helper service
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -558,6 +558,12 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
                 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\FilesystemLoader',
             ));
         }
+
+        if ($container->hasDefinition('assets.packages')) {
+            $container->getDefinition('templating.helper.assets')->replaceArgument(0, new Reference('assets.packages'));
+        } else {
+            $container->removeDefinition('templating.helper.assets');
+        }
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', array(
+    'templating' => array(
+        'engines' => array('php', 'twig'),
+    ),
+));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets_disabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets_disabled.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:templating>
+            <framework:engine>php</framework:engine>
+            <framework:engine>twig</framework:engine>
+        </framework:templating>
+    </framework:config>
+</container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/assets_disabled.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/assets_disabled.yml
@@ -0,0 +1,3 @@
+framework:
+    templating:
+        engines:          [php, twig]
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -445,6 +445,22 @@ public function testSerializerEnabled()
         $this->assertTrue($container->has('serializer'));
     }
 
+    public function testAssetHelperWhenAssetsAreEnabled()
+    {
+        $container = $this->createContainerFromFile('full');
+        $packages = $container->getDefinition('templating.helper.assets')->getArgument(0);
+
+        $this->assertSame('assets.packages', (string) $packages);
+    }
+
+    public function testAssetHelperWhenTemplatesAreEnabledAndAssetsAreDisabled()
+    {
+        $container = $this->createContainerFromFile('assets_disabled');
+        $packages = $container->getDefinition('templating.helper.assets')->getArgument(0);
+
+        $this->assertSame('assets.packages', (string) $packages);
+    }
+
     protected function createContainer(array $data = array())
     {
         return new ContainerBuilder(new ParameterBag(array_merge(array(

Original file line number	Diff line number	Diff line change
`@@ -558,6 +558,12 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB`
`558`	`558`	`'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\FilesystemLoader',`
`559`	`559`	`));`
`560`	`560`	`}`
	`561`	`+`
	`562`	`+ if ($container->hasDefinition('assets.packages')) {`
	`563`	`+ $container->getDefinition('templating.helper.assets')->replaceArgument(0, new Reference('assets.packages'));`
	`564`	`+ } else {`
	`565`	`+ $container->removeDefinition('templating.helper.assets');`
	`566`	`+ }`
`561`	`567`	`}`
`562`	`568`
`563`	`569`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+framework:`
	`2`	`+ templating:`
	`3`	`+ engines: [php, twig]`