diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index 655e95cf93061..572624428c6e8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -99,7 +99,7 @@ public function getConfigTreeBuilder() foreach ($v['templating']['packages'] as $name => $config) { $v['assets']['packages'][$name] = array( - 'version' => (string) $config['version'], + 'version' => $config['version'], 'version_format' => $config['version_format'], 'base_path' => '', 'base_urls' => array_values(array_unique(array_merge($config['base_urls']['http'], $config['base_urls']['ssl']))), diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 7e69c28fd825f..b70def8df11e6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -584,12 +584,8 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co $namedPackages = array(); foreach ($config['packages'] as $name => $package) { - if (null === $package['version']) { - $version = $defaultVersion; - } else { - $format = $package['version_format'] ?: $config['version_format']; - $version = $this->createVersion($container, $package['version'], $format, $name); - } + $format = $package['version_format'] ?: $config['version_format']; + $version = $this->createVersion($container, $package['version'], $format, $name); $container->setDefinition('assets._package_'.$name, $this->createPackageDefinition($package['base_path'], $package['base_urls'], $version)); $namedPackages[$name] = new Reference('assets._package_'.$name);