Merge branch '2.7' into 2.8

* 2.7:
  [TwigBundle] fixed usage of getSource in tests
  Trim constant values in XmlFileLoader
  move test to the HttpKernel component
  [TwigBridge] fixed Twig_Source required argument

Author: fabpot

Tests/Bundle/BundleTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Bundle;
 
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionNotValidBundle\ExtensionNotValidBundle;
 use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\ExtensionPresentBundle;
 use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionAbsentBundle\ExtensionAbsentBundle;
@@ -51,4 +52,18 @@ public function testGetContainerExtensionWithInvalidClass()
         $bundle = new ExtensionNotValidBundle();
         $bundle->getContainerExtension();
     }
+
+    public function testHttpKernelRegisterCommandsIgnoresCommandsThatAreRegisteredAsServices()
+    {
+        $container = new ContainerBuilder();
+        $container->register('console.command.Symfony_Component_HttpKernel_Tests_Fixtures_ExtensionPresentBundle_Command_FooCommand', 'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand');
+
+        $application = $this->getMock('Symfony\Component\Console\Application');
+        // add() is never called when the found command classes are already registered as services
+        $application->expects($this->never())->method('add');
+
+        $bundle = new ExtensionPresentBundle();
+        $bundle->setContainer($container);
+        $bundle->registerCommands($application);
+    }
 }