[Console] Commands with an alias should not be recognized as ambiguous

Amrouche Hamza · Simperfit · commit 4a38b3c4e292 · 2019-04-26T08:33:47.000+02:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -494,7 +494,21 @@ public function find($name)
     {
         $this->init();
         $aliases = array();
+
+        foreach ($this->commands as $command) {
+            foreach ($command->getAliases() as $alias) {
+                if (!isset($this->commands[$alias])) {
+                    $this->commands[$alias] = $command;
+                }
+            }
+        }
+
         $allCommands = array_keys($this->commands);
+
+        if (isset($this->commands[$name])) {
+            return $this->get($name);
+        }
+
         $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { return preg_quote($matches[1]).'[^:]*'; }, $name);
         $commands = preg_grep('{^'.$expr.'}', $allCommands);
 
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -49,8 +49,8 @@ public static function setUpBeforeClass()
         require_once self::$fixturesPath.'/BarBucCommand.php';
         require_once self::$fixturesPath.'/FooSubnamespaced1Command.php';
         require_once self::$fixturesPath.'/FooSubnamespaced2Command.php';
-        require_once self::$fixturesPath.'/TestTiti.php';
-        require_once self::$fixturesPath.'/TestToto.php';
+        require_once self::$fixturesPath.'/TestAmbiguousCommandRegistering.php';
+        require_once self::$fixturesPath.'/TestAmbiguousCommandRegistering2.php';
     }
 
     protected function normalizeLineBreaks($text)
@@ -122,6 +122,27 @@ public function testRegister()
         $this->assertEquals('foo', $command->getName(), '->register() registers a new command');
     }
 
+    public function testRegisterAmbiguous()
+    {
+        $code = function (InputInterface $input, OutputInterface $output) {
+            $output->writeln('It works!');
+        };
+
+        $application = new Application();
+        $application
+            ->register('test-foo')
+            ->setAliases(array('test'))
+            ->setCode($code);
+
+        $application
+            ->register('test-bar')
+            ->setCode($code);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(array('test'));
+        $this->assertContains('It works!', $tester->getDisplay(true));
+    }
+
     public function testAdd()
     {
         $application = new Application();
@@ -231,9 +252,9 @@ public function testFindAmbiguousNamespace()
     public function testFindNonAmbiguous()
     {
         $application = new Application();
-        $application->add(new \TestTiti());
-        $application->add(new \TestToto());
-        $this->assertEquals('test-toto', $application->find('test')->getName());
+        $application->add(new \TestAmbiguousCommandRegistering());
+        $application->add(new \TestAmbiguousCommandRegistering2());
+        $this->assertEquals('test-ambiguous', $application->find('test')->getName());
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering.php b/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering.php
@@ -4,19 +4,19 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class TestToto extends Command
+class TestAmbiguousCommandRegistering extends Command
 {
     protected function configure()
     {
         $this
-            ->setName('test-toto')
-            ->setDescription('The test-toto command')
+            ->setName('test-ambiguous')
+            ->setDescription('The test-ambiguous command')
             ->setAliases(array('test'))
         ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $output->write('test-toto');
+        $output->write('test-ambiguous');
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php b/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php
@@ -4,18 +4,18 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class TestTiti extends Command
+class TestAmbiguousCommandRegistering2 extends Command
 {
     protected function configure()
     {
         $this
-            ->setName('test-titi')
-            ->setDescription('The test:titi command')
+            ->setName('test-ambiguous2')
+            ->setDescription('The test-ambiguous2 command')
         ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $output->write('test-titi');
+        $output->write('test-ambiguous2');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,19 +4,19 @@`
`4`	`4`	`use Symfony\Component\Console\Input\InputInterface;`
`5`	`5`	`use Symfony\Component\Console\Output\OutputInterface;`
`6`	`6`
`7`		`-class TestToto extends Command`
	`7`	`+class TestAmbiguousCommandRegistering extends Command`
`8`	`8`	`{`
`9`	`9`	`protected function configure()`
`10`	`10`	`{`
`11`	`11`	`$this`
`12`		`- ->setName('test-toto')`
`13`		`- ->setDescription('The test-toto command')`
	`12`	`+ ->setName('test-ambiguous')`
	`13`	`+ ->setDescription('The test-ambiguous command')`
`14`	`14`	`->setAliases(array('test'))`
`15`	`15`	`;`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`protected function execute(InputInterface $input, OutputInterface $output)`
`19`	`19`	`{`
`20`		`- $output->write('test-toto');`
	`20`	`+ $output->write('test-ambiguous');`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,18 +4,18 @@`
`4`	`4`	`use Symfony\Component\Console\Input\InputInterface;`
`5`	`5`	`use Symfony\Component\Console\Output\OutputInterface;`
`6`	`6`
`7`		`-class TestTiti extends Command`
	`7`	`+class TestAmbiguousCommandRegistering2 extends Command`
`8`	`8`	`{`
`9`	`9`	`protected function configure()`
`10`	`10`	`{`
`11`	`11`	`$this`
`12`		`- ->setName('test-titi')`
`13`		`- ->setDescription('The test:titi command')`
	`12`	`+ ->setName('test-ambiguous2')`
	`13`	`+ ->setDescription('The test-ambiguous2 command')`
`14`	`14`	`;`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`protected function execute(InputInterface $input, OutputInterface $output)`
`18`	`18`	`{`
`19`		`- $output->write('test-titi');`
	`19`	`+ $output->write('test-ambiguous2');`
`20`	`20`	`}`
`21`	`21`	`}`