Merge remote branch 'kriswallsmith/framework/asset-packages-fix'
* kriswallsmith/framework/asset-packages-fix: [FrameworkBundle] fixed build of config for asset packages
This commit is contained in:
commit
6051577b7e
@ -340,12 +340,12 @@ class FrameworkExtension extends Extension
|
||||
|
||||
$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']);
|
||||
|
@ -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%">
|
||||
|
Reference in New Issue
Block a user