diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Console] Inline exact-match handling with 4.4

Browse Source
This commit is contained in:
Robin Chalas 2020-02-15 14:27:16 +01:00
parent b92168c110
commit e13470c823
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Symfony/Component/Console/Application.php
View File

@ -608,6 +608,10 @@ class Application
} }
} }
if ($this->has($name)) {
return $this->get($name);
}
$allCommands = $this->commandLoader ? array_merge($this->commandLoader->getNames(), array_keys($this->commands)) : array_keys($this->commands); $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); $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { return preg_quote($matches[1]).'[^:]*'; }, $name);
$commands = preg_grep('{^'.$expr.'}', $allCommands); $commands = preg_grep('{^'.$expr.'}', $allCommands);
@ -645,15 +649,7 @@ class Application
// filter out aliases for commands which are already on the list // filter out aliases for commands which are already on the list
if (\count($commands) > 1) { if (\count($commands) > 1) {
$commandList = $this->commandLoader ? array_merge(array_flip($this->commandLoader->getNames()), $this->commands) : $this->commands; $commandList = $this->commandLoader ? array_merge(array_flip($this->commandLoader->getNames()), $this->commands) : $this->commands;
$commands = array_unique(array_filter($commands, function ($nameOrAlias) use (&$commandList, $commands, &$aliases) {
if (isset($commandList[$name])) {
return $this->get($name);
}
foreach ($commands as $k => $nameOrAlias) {
if ($nameOrAlias === $name) {
return $this->get($nameOrAlias);
}
if (!$commandList[$nameOrAlias] instanceof Command) { if (!$commandList[$nameOrAlias] instanceof Command) {
$commandList[$nameOrAlias] = $this->commandLoader->get($nameOrAlias); $commandList[$nameOrAlias] = $this->commandLoader->get($nameOrAlias);
} }
@ -662,14 +658,8 @@ class Application
$aliases[$nameOrAlias] = $commandName; $aliases[$nameOrAlias] = $commandName;
if ($commandName === $nameOrAlias || !\in_array($commandName, $commands)) { return $commandName === $nameOrAlias || !\in_array($commandName, $commands);
continue; }));
}
unset($commands[$k]);
}
$commands = array_unique($commands);
} }
$exact = \in_array($name, $commands, true) || isset($aliases[$name]); $exact = \in_array($name, $commands, true) || isset($aliases[$name]);