From 2f8d5cd1c04b588ccc43fa3c6d3f79a041192bd7 Mon Sep 17 00:00:00 2001
From: Kris Wallsmith <kris.wallsmith@gmail.com>
Date: Thu, 24 Mar 2011 15:17:59 -0700
Subject: [PATCH] [FrameworkBundle] fixed build of config for asset packages

---
 .../DependencyInjection/FrameworkExtension.php                | 4 ++--
 .../FrameworkBundle/Resources/config/templating_php.xml       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 45c325108560..dabbe6f65c89 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -340,12 +340,12 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
 
         $packages = array();
         foreach ($config['packages'] as $name => $package) {
-            $packages[$name] = new Definition('Symfony\\Component\\Templating\\Asset\\AssetPackage', array(
+            $packages[$name] = new Definition('%templating.asset_package.class%', array(
                 $package['base_urls'],
                 $package['version'],
             ));
         }
-        $container->setParameter('templating.assets.packages', $packages);
+        $container->getDefinition('templating.helper.assets')->setArgument(3, $packages);
 
         if (!empty($config['loaders'])) {
             $loaders = array_map(function($loader) { return new Reference($loader); }, $config['loaders']);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
index 1b92314e3d9a..39974b624eaf 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
@@ -16,6 +16,7 @@
         <parameter key="templating.helper.translator.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper</parameter>
         <parameter key="templating.helper.form.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper</parameter>
         <parameter key="templating.globals.class">Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables</parameter>
+        <parameter key="templating.asset_package.class">Symfony\Component\Templating\Asset\AssetPackage</parameter>
     </parameters>
 
     <services>
@@ -36,7 +37,7 @@
             <argument type="service" id="request" strict="false" />
             <argument>%templating.assets.base_urls%</argument>
             <argument>%templating.assets.version%</argument>
-            <argument>%templating.assets.packages%</argument>
+            <argument type="collection" />
         </service>
 
         <service id="templating.helper.request" class="%templating.helper.request.class%">