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

Fix merge

Browse Source
This commit is contained in:
Robin Chalas 2017-08-29 23:15:51 +02:00
parent 2e111b3cca
commit b9fc357d1c
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -505,13 +505,9 @@ class Application
*/
public function has($name)
{
<<<<<<< HEAD
return isset($this->commands[$name]) || ($this->commandLoader && $this->commandLoader->has($name));
=======
$this->init();
return isset($this->commands[$name]);
>>>>>>> 3.3
return isset($this->commands[$name]) || ($this->commandLoader && $this->commandLoader->has($name));
}
/**
@ -588,13 +584,9 @@ class Application
*/
public function find($name)
{
<<<<<<< HEAD
$allCommands = $this->commandLoader ? array_merge($this->commandLoader->getNames(), array_keys($this->commands)) : array_keys($this->commands);
=======
$this->init();
$allCommands = array_keys($this->commands);
>>>>>>> 3.3
$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);