[FrameworkBundle] removed templating.assets.version and templating.assets.base_urls parameters

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

@@ -174,7 +174,7 @@ class Configuration
                 ->arrayNode('templating')
                     ->canBeUnset()
                     ->children()
-                        ->scalarNode('assets_version')->end()
+                        ->scalarNode('assets_version')->defaultValue(null)->end()
                     ->end()
                     ->fixXmlConfig('assets_base_url')
                     ->children()

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

@@ -330,14 +330,6 @@ class FrameworkExtension extends Extension
             $loader->load('templating_debug.xml');
         }
 
-        if (isset($config['assets_version'])) {
-            $container->setParameter('templating.assets.version', $config['assets_version']);
-        }
-
-        if (isset($config['assets_base_urls'])) {
-            $container->setParameter('templating.assets.base_urls', $config['assets_base_urls']);
-        }
-
         $packages = array();
         foreach ($config['packages'] as $name => $package) {
             $packages[$name] = new Definition('%templating.asset_package.class%', array(
@@ -345,7 +337,12 @@ class FrameworkExtension extends Extension
                 $package['version'],
             ));
         }
-        $container->getDefinition('templating.helper.assets')->setArgument(3, $packages);
+        $container
+            ->getDefinition('templating.helper.assets')
+            ->setArgument(1, isset($config['assets_base_urls']) ? $config['assets_base_urls'] : array())
+            ->setArgument(2, $config['assets_version'])
+            ->setArgument(3, $packages)
+        ;
 
         if (!empty($config['loaders'])) {
             $loaders = array_map(function($loader) { return new Reference($loader); }, $config['loaders']);

src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml

@@ -13,8 +13,6 @@
         <parameter key="templating.loader.filesystem.class">Symfony\Bundle\FrameworkBundle\Templating\Loader\FilesystemLoader</parameter>
         <parameter key="templating.loader.cache.class">Symfony\Component\Templating\Loader\CacheLoader</parameter>
         <parameter key="templating.loader.chain.class">Symfony\Component\Templating\Loader\ChainLoader</parameter>
-        <parameter key="templating.assets.version">null</parameter>
-        <parameter key="templating.assets.base_urls" type="collection"></parameter>
     </parameters>
 
     <services>

src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml

@@ -35,9 +35,9 @@
         <service id="templating.helper.assets" class="%templating.helper.assets.class%">
             <tag name="templating.helper" alias="assets" />
             <argument type="service" id="request" strict="false" />
-            <argument>%templating.assets.base_urls%</argument>
-            <argument>%templating.assets.version%</argument>
-            <argument type="collection" />
+            <argument type="collection" /> <!-- assets base URLs -->
+            <argument /> <!-- assets version -->
+            <argument type="collection" /> <!-- packages -->
         </service>
 
         <service id="templating.helper.request" class="%templating.helper.request.class%">

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

@@ -104,8 +104,9 @@ abstract class FrameworkExtensionTest extends TestCase
         $container = $this->createContainerFromFile('full');
 
         $this->assertTrue($container->hasDefinition('templating.name_parser'), '->registerTemplatingConfiguration() loads templating.xml');
-        $this->assertEquals('SomeVersionScheme', $container->getParameter('templating.assets.version'));
-        $this->assertEquals(array('http://cdn.example.com'), $container->getParameter('templating.assets.base_urls'));
+        $arguments = $container->getDefinition('templating.helper.assets')->getArguments();
+        $this->assertEquals('SomeVersionScheme', $arguments[2]);
+        $this->assertEquals(array('http://cdn.example.com'), $arguments[1]);
 
         $this->assertTrue($container->getDefinition('templating.cache_warmer.template_paths')->hasTag('kernel.cache_warmer'), '->registerTemplatingConfiguration() tags templating cache warmer if cache warming is set');
         $this->assertEquals('templating.locator.cached', (string) $container->getAlias('templating.locator'), '->registerTemplatingConfiguration() changes templating.locator alias to cached if cache warming is set');