Fix aliases handling in command name completion

Seldaek · Seldaek · commit 863d1c1692a7 · 2022-05-13T12:12:35.000+02:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -363,9 +363,18 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
             CompletionInput::TYPE_ARGUMENT_VALUE === $input->getCompletionType()
             && 'command' === $input->getCompletionName()
         ) {
-            $suggestions->suggestValues(array_filter(array_map(function (Command $command) {
-                return $command->isHidden() ? null : $command->getName();
-            }, $this->all())));
+            $commandNames = [];
+            foreach ($this->all() as $name => $command) {
+                // skip hidden commands and aliased commands as they already get added below
+                if ($command->isHidden() || $command->getName() !== $name) {
+                    continue;
+                }
+                $commandNames[] = $command->getName();
+                foreach ($command->getAliases() as $name) {
+                    $commandNames[] = $name;
+                }
+            }
+            $suggestions->suggestValues($commandNames);
 
             return;
         }
diff --git a/src/Symfony/Component/Console/Command/CompleteCommand.php b/src/Symfony/Component/Console/Command/CompleteCommand.php
@@ -105,11 +105,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             } elseif (
                 $completionInput->mustSuggestArgumentValuesFor('command')
                 && $command->getName() !== $completionInput->getCompletionValue()
+                && !\in_array($completionInput->getCompletionValue(), $command->getAliases(), true)
             ) {
                 $this->log('  No command found, completing using the Application class.');
 
                 // expand shortcut names ("cache:cl<TAB>") into their full name ("cache:clear")
-                $suggestions->suggestValue($command->getName());
+                $suggestions->suggestValues(array_merge([$command->getName()], $command->getAliases()));
             } else {
                 $command->mergeApplicationDefinition();
                 $completionInput->bind($command->getDefinition());
diff --git a/src/Symfony/Component/Console/Tests/Command/CompleteCommandTest.php b/src/Symfony/Component/Console/Tests/Command/CompleteCommandTest.php
@@ -102,9 +102,10 @@ public function testCompleteCommandName(array $input, array $suggestions)
 
     public function provideCompleteCommandNameInputs()
     {
-        yield 'empty' => [['bin/console'], ['help', 'list', 'completion', 'hello']];
-        yield 'partial' => [['bin/console', 'he'], ['help', 'list', 'completion', 'hello']];
-        yield 'complete-shortcut-name' => [['bin/console', 'hell'], ['hello']];
+        yield 'empty' => [['bin/console'], ['help', 'list', 'completion', 'hello', 'ahoy']];
+        yield 'partial' => [['bin/console', 'he'], ['help', 'list', 'completion', 'hello', 'ahoy']];
+        yield 'complete-shortcut-name' => [['bin/console', 'hell'], ['hello', 'ahoy']];
+        yield 'complete-aliases' => [['bin/console', 'ah'], ['hello', 'ahoy']];
     }
 
     /**
@@ -120,6 +121,8 @@ public function provideCompleteCommandInputDefinitionInputs()
     {
         yield 'definition' => [['bin/console', 'hello', '-'], ['--help', '--quiet', '--verbose', '--version', '--ansi', '--no-interaction']];
         yield 'custom' => [['bin/console', 'hello'], ['Fabien', 'Robin', 'Wouter']];
+        yield 'definition-aliased' => [['bin/console', 'ahoy', '-'], ['--help', '--quiet', '--verbose', '--version', '--ansi', '--no-interaction']];
+        yield 'custom-aliased' => [['bin/console', 'ahoy'], ['Fabien', 'Robin', 'Wouter']];
     }
 
     private function execute(array $input)
@@ -134,6 +137,7 @@ class CompleteCommandTest_HelloCommand extends Command
     public function configure(): void
     {
         $this->setName('hello')
+             ->setAliases(['ahoy'])
              ->addArgument('name', InputArgument::REQUIRED)
          ;
     }

Original file line number	Diff line number	Diff line change
`@@ -102,9 +102,10 @@ public function testCompleteCommandName(array $input, array $suggestions)`
`102`	`102`
`103`	`103`	`public function provideCompleteCommandNameInputs()`
`104`	`104`	`{`
`105`		`- yield 'empty' => [['bin/console'], ['help', 'list', 'completion', 'hello']];`
`106`		`- yield 'partial' => [['bin/console', 'he'], ['help', 'list', 'completion', 'hello']];`
`107`		`- yield 'complete-shortcut-name' => [['bin/console', 'hell'], ['hello']];`
	`105`	`+ yield 'empty' => [['bin/console'], ['help', 'list', 'completion', 'hello', 'ahoy']];`
	`106`	`+ yield 'partial' => [['bin/console', 'he'], ['help', 'list', 'completion', 'hello', 'ahoy']];`
	`107`	`+ yield 'complete-shortcut-name' => [['bin/console', 'hell'], ['hello', 'ahoy']];`
	`108`	`+ yield 'complete-aliases' => [['bin/console', 'ah'], ['hello', 'ahoy']];`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`/**`
`@@ -120,6 +121,8 @@ public function provideCompleteCommandInputDefinitionInputs()`
`120`	`121`	`{`
`121`	`122`	`yield 'definition' => [['bin/console', 'hello', '-'], ['--help', '--quiet', '--verbose', '--version', '--ansi', '--no-interaction']];`
`122`	`123`	`yield 'custom' => [['bin/console', 'hello'], ['Fabien', 'Robin', 'Wouter']];`
	`124`	`+ yield 'definition-aliased' => [['bin/console', 'ahoy', '-'], ['--help', '--quiet', '--verbose', '--version', '--ansi', '--no-interaction']];`
	`125`	`+ yield 'custom-aliased' => [['bin/console', 'ahoy'], ['Fabien', 'Robin', 'Wouter']];`
`123`	`126`	`}`
`124`	`127`
`125`	`128`	`private function execute(array $input)`
`@@ -134,6 +137,7 @@ class CompleteCommandTest_HelloCommand extends Command`
`134`	`137`	`public function configure(): void`
`135`	`138`	`{`
`136`	`139`	`$this->setName('hello')`
	`140`	`+ ->setAliases(['ahoy'])`
`137`	`141`	`->addArgument('name', InputArgument::REQUIRED)`
`138`	`142`	`;`
`139`	`143`	`}`