Merge remote branch 'kriswallsmith/framework/package-config-fix'

* kriswallsmith/framework/package-config-fix:
  [FrameworkBundle] updated extension to use replaceArgument() rather than a parameter

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

@@ -321,7 +321,7 @@ class FrameworkExtension extends Extension
 
         $container->setParameter('templating.helper.assets.assets_base_urls', isset($config['assets_base_urls']) ? $config['assets_base_urls'] : array());
         $container->setParameter('templating.helper.assets.assets_version', $config['assets_version']);
-        $container->setParameter('templating.helper.assets.packages', $packages);
+        $container->getDefinition('templating.helper.assets')->replaceArgument(3, $packages);
 
         if (!empty($config['loaders'])) {
             $loaders = array_map(function($loader) { return new Reference($loader); }, $config['loaders']);

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

@@ -37,7 +37,7 @@
             <argument type="service" id="request" strict="false" />
             <argument>%templating.helper.assets.assets_base_urls%</argument>
             <argument>%templating.helper.assets.assets_version%</argument>
-            <argument>%templating.helper.assets.packages%</argument>
+            <argument type="collection" /> <!-- packages -->
         </service>
 
         <service id="templating.helper.request" class="%templating.helper.request.class%">