Merge branch '2.7' into 2.8

* 2.7:
  Ability to set empty version strategy in packages
  CLI: use request context to generate absolute URLs
  [SecurityBundle] Optimize dependency injection tests
  Sort bundles in config commands
  [HttpFoundation] Do not overwrite the Authorization header if it is already set
  tag for dumped PHP objects must be a local one

Author: fabpot

Command/AbstractConfigCommand.php

@@ -29,7 +29,13 @@ protected function listBundles($output)
     {
         $headers = array('Bundle name', 'Extension alias');
         $rows = array();
-        foreach ($this->getContainer()->get('kernel')->getBundles() as $bundle) {
+
+        $bundles = $this->getContainer()->get('kernel')->getBundles();
+        usort($bundles, function($bundleA, $bundleB) {
+            return strcmp($bundleA->getName(), $bundleB->getName());
+        });
+
+        foreach ($bundles as $bundle) {
             $extension = $bundle->getContainerExtension();
             $rows[] = array($bundle->getName(), $extension ? $extension->getAlias() : '');
         }

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' => null === $config['version'] ? null : (string) $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']))),
@@ -530,7 +530,13 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
                             ->prototype('array')
                                 ->fixXmlConfig('base_url')
                                 ->children()
-                                    ->scalarNode('version')->defaultNull()->end()
+                                    ->scalarNode('version')
+                                        ->defaultNull()
+                                        ->beforeNormalization()
+                                        ->ifTrue(function ($v) { return '' === $v; })
+                                        ->then(function ($v) { return; })
+                                        ->end()
+                                    ->end()
                                     ->scalarNode('version_format')->defaultValue('%%s?%%s')->end()
                                     ->arrayNode('base_urls')
                                         ->performNoDeepMerging()
@@ -589,7 +595,12 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode)
                             ->prototype('array')
                                 ->fixXmlConfig('base_url')
                                 ->children()
-                                    ->scalarNode('version')->defaultNull()->end()
+                                    ->scalarNode('version')
+                                        ->beforeNormalization()
+                                        ->ifTrue(function ($v) { return '' === $v; })
+                                        ->then(function ($v) { return; })
+                                        ->end()
+                                    ->end()
                                     ->scalarNode('version_format')->defaultNull()->end()
                                     ->scalarNode('base_path')->defaultValue('')->end()
                                     ->arrayNode('base_urls')

DependencyInjection/FrameworkExtension.php

@@ -593,7 +593,7 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co
 
         $namedPackages = array();
         foreach ($config['packages'] as $name => $package) {
-            if (null === $package['version']) {
+            if (!array_key_exists('version', $package)) {
                 $version = $defaultVersion;
             } else {
                 $format = $package['version_format'] ?: $config['version_format'];

Tests/DependencyInjection/Fixtures/php/assets.php

@@ -20,6 +20,10 @@
             'bar' => array(
                 'base_urls' => array('https://bar2.example.com'),
             ),
+            'bar_null_version' => array(
+                'version' => null,
+                'base_urls' => array('https://bar3.example.com'),
+            ),
         ),
     ),
 ));

Tests/DependencyInjection/Fixtures/php/legacy_templating_assets.php

@@ -18,6 +18,10 @@
             'bar' => array(
                 'base_urls' => array('https://bar2.example.com'),
             ),
+            'bar_null_version' => array(
+                'version' => null,
+                'base_urls' => array('https://bar3.example.com'),
+            ),
         ),
     ),
 ));

Tests/DependencyInjection/Fixtures/xml/assets.xml

@@ -18,6 +18,9 @@
             <framework:package name="bar">
                 <framework:base-url>https://bar2.example.com</framework:base-url>
             </framework:package>
+            <framework:package name="bar_null_version" version="">
+                <framework:base-url>https://bar3.example.com</framework:base-url>
+            </framework:package>
         </framework:assets>
     </framework:config>
 </container>

Tests/DependencyInjection/Fixtures/xml/legacy_templating_assets.xml

@@ -18,6 +18,9 @@
             <framework:package name="bar">
                 <framework:base-url>https://bar2.example.com</framework:base-url>
             </framework:package>
+            <framework:package name="bar_null_version" version="">
+                <framework:base-url>https://bar3.example.com</framework:base-url>
+            </framework:package>
         </framework:templating>
     </framework:config>
 </container>

Tests/DependencyInjection/Fixtures/yml/assets.yml

@@ -14,3 +14,6 @@ framework:
                 version_format: %%s-%%s
             bar:
                 base_urls: ["https://bar2.example.com"]
+            bar_null_version:
+                version: null
+                base_urls: "https://bar3.example.com"

Tests/DependencyInjection/Fixtures/yml/legacy_templating_assets.yml

@@ -13,3 +13,6 @@ framework:
                 version_format: %%s-%%s
             bar:
                 base_urls: "https://bar2.example.com"
+            bar_null_version:
+                version: null
+                base_urls: "https://bar3.example.com"

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -552,7 +552,7 @@ private function checkAssetsPackages(ContainerBuilder $container, $legacy = fals
 
         // packages
         $packages = $packages->getArgument(1);
-        $this->assertCount($legacy ? 3 : 4, $packages);
+        $this->assertCount($legacy ? 4 : 5, $packages);
 
         if (!$legacy) {
             $package = $container->getDefinition($packages['images_path']);
@@ -566,7 +566,10 @@ private function checkAssetsPackages(ContainerBuilder $container, $legacy = fals
         $this->assertPathPackage($container, $package, '', '1.0.0', '%%s-%%s');
 
         $package = $container->getDefinition($packages['bar']);
-        $this->assertUrlPackage($container, $package, array('https://bar2.example.com'), $legacy ? '' : 'SomeVersionScheme', $legacy ? '%%s?%%s' : '%%s?version=%%s');
+        $this->assertUrlPackage($container, $package, array('https://bar2.example.com'), $legacy ? null : 'SomeVersionScheme', $legacy ? '%%s?%%s' : '%%s?version=%%s');
+
+        $this->assertEquals($legacy ? 'assets.empty_version_strategy' : 'assets._version__default', (string) $container->getDefinition('assets._package_bar')->getArgument(1));
+        $this->assertEquals('assets.empty_version_strategy', (string) $container->getDefinition('assets._package_bar_null_version')->getArgument(1));
     }
 
     private function assertPathPackage(ContainerBuilder $container, DefinitionDecorator $package, $basePath, $version, $format)