[FrameworkBundle][Console] Fix the override of a command registered by the kernel

aaa2000 · aaa2000 · commit 3e6643bd9074 · 2017-05-24T23:07:05.000+02:00
Fix #18558
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\Console\Application as BaseApplication;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -120,6 +121,16 @@ public function all($namespace = null)
         return parent::all($namespace);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function add(Command $command)
+    {
+        $this->registerCommands();
+
+        return parent::add($command);
+    }
+
     protected function registerCommands()
     {
         if ($this->commandsRegistered) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
@@ -115,6 +115,21 @@ public function testBundleCommandsHaveRightContainer()
         $tester->run(array('command' => 'foo'));
     }
 
+    public function testBundleCommandCanOverriddeAPreExistingCommandWithTheSameName()
+    {
+        $command = new Command('example');
+
+        $bundle = $this->createBundleMock(array($command));
+
+        $kernel = $this->getKernel(array($bundle));
+
+        $application = new Application($kernel);
+        $newCommand = new Command('example');
+        $application->add($newCommand);
+
+        $this->assertSame($newCommand, $application->get('example'));
+    }
+
     private function getKernel(array $bundles, $useDispatcher = false)
     {
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
