[Console] Optimisation on getting the command

Simperfit · Simperfit · commit 995f25c3c5b0 · 2019-05-12T07:32:26.000+02:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -623,6 +623,10 @@ public function find($name)
             }
         }
 
+        if ($this->has($name)) {
+            return $this->get($name);
+        }
+
         $allCommands = $this->commandLoader ? array_merge($this->commandLoader->getNames(), array_keys($this->commands)) : array_keys($this->commands);
         $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { return preg_quote($matches[1]).'[^:]*'; }, $name);
         $commands = preg_grep('{^'.$expr.'}', $allCommands);
@@ -663,7 +667,6 @@ public function find($name)
             }));
         }
 
-        $exact = \in_array($name, $commands, true) || isset($aliases[$name]);
         if (\count($commands) > 1) {
             $usableWidth = $this->terminal->getWidth() - 10;
             $abbrevs = array_values($commands);
@@ -684,7 +687,7 @@ public function find($name)
             throw new CommandNotFoundException(sprintf("Command \"%s\" is ambiguous.\nDid you mean one of these?\n%s", $name, $suggestions), array_values($commands));
         }
 
-        return $this->get($exact ? $name : reset($commands));
+        return $this->get($name);
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php b/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php
@@ -0,0 +1,21 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class TestAmbiguousCommandRegistering2 extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('test-ambiguous2')
+            ->setDescription('The test-ambiguous2 command')
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $output->write('test-ambiguous2');
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -623,6 +623,10 @@ public function find($name)`
`623`	`623`	`}`
`624`	`624`	`}`
`625`	`625`
	`626`	`+ if ($this->has($name)) {`
	`627`	`+ return $this->get($name);`
	`628`	`+ }`
	`629`	`+`
`626`	`630`	`$allCommands = $this->commandLoader ? array_merge($this->commandLoader->getNames(), array_keys($this->commands)) : array_keys($this->commands);`
`627`	`631`	`$expr = preg_replace_callback('{([^:]+\|)}', function ($matches) { return preg_quote($matches[1]).'[^:]*'; }, $name);`
`628`	`632`	`$commands = preg_grep('{^'.$expr.'}', $allCommands);`
`@@ -663,7 +667,6 @@ public function find($name)`
`663`	`667`	`}));`
`664`	`668`	`}`
`665`	`669`
`666`		`- $exact = \in_array($name, $commands, true) \|\| isset($aliases[$name]);`
`667`	`670`	`if (\count($commands) > 1) {`
`668`	`671`	`$usableWidth = $this->terminal->getWidth() - 10;`
`669`	`672`	`$abbrevs = array_values($commands);`
`@@ -684,7 +687,7 @@ public function find($name)`
`684`	`687`	`throw new CommandNotFoundException(sprintf("Command \"%s\" is ambiguous.\nDid you mean one of these?\n%s", $name, $suggestions), array_values($commands));`
`685`	`688`	`}`
`686`	`689`
`687`		`- return $this->get($exact ? $name : reset($commands));`
	`690`	`+ return $this->get($name);`
`688`	`691`	`}`
`689`	`692`
`690`	`693`	`/**`