minor #23533 [Console] Application is not responsible for setting the name of lazy commands (chalasr)

fabpot · fabpot · commit 2fa948d32850 · 2017-07-17T14:48:33.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Console] Application is not responsible for setting the name of lazy commands | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Fixes `all` not calling `get()` for lazy commands and stop setting the command name from Application (the command loader is responsible for returning valid commands). Commits ------- f25a8b5 Fix lazy commands registration
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -466,7 +466,6 @@ public function get($name)
             $command = $this->commands[$name];
         } elseif ($this->commandLoader && $this->commandLoader->has($name)) {
             $command = $this->commandLoader->get($name);
-            $command->setName($name);
             $this->add($command);
         } else {
             throw new CommandNotFoundException(sprintf('The command "%s" does not exist.', $name));
@@ -647,7 +646,7 @@ public function all($namespace = null)
             $commands = $this->commands;
             foreach ($this->commandLoader->getNames() as $name) {
                 if (!isset($commands[$name])) {
-                    $commands[$name] = $this->commandLoader->get($name);
+                    $commands[$name] = $this->get($name);
                 }
             }
 
@@ -664,7 +663,7 @@ public function all($namespace = null)
         if ($this->commandLoader) {
             foreach ($this->commandLoader->getNames() as $name) {
                 if (!isset($commands[$name]) && $namespace === $this->extractNamespace($name, substr_count($namespace, ':') + 1)) {
-                    $commands[$name] = $this->commandLoader->get($name);
+                    $commands[$name] = $this->get($name);
                 }
             }
         }
diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
@@ -87,6 +87,8 @@ public function process(ContainerBuilder $container)
                 }
             }
 
+            $definition->addMethodCall('setName', array($commandName));
+
             if ($aliases) {
                 $definition->addMethodCall('setAliases', array($aliases));
             }

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,6 @@ public function get($name)`
`466`	`466`	`$command = $this->commands[$name];`
`467`	`467`	`} elseif ($this->commandLoader && $this->commandLoader->has($name)) {`
`468`	`468`	`$command = $this->commandLoader->get($name);`
`469`		`- $command->setName($name);`
`470`	`469`	`$this->add($command);`
`471`	`470`	`} else {`
`472`	`471`	`throw new CommandNotFoundException(sprintf('The command "%s" does not exist.', $name));`
`@@ -647,7 +646,7 @@ public function all($namespace = null)`
`647`	`646`	`$commands = $this->commands;`
`648`	`647`	`foreach ($this->commandLoader->getNames() as $name) {`
`649`	`648`	`if (!isset($commands[$name])) {`
`650`		`- $commands[$name] = $this->commandLoader->get($name);`
	`649`	`+ $commands[$name] = $this->get($name);`
`651`	`650`	`}`
`652`	`651`	`}`
`653`	`652`
`@@ -664,7 +663,7 @@ public function all($namespace = null)`
`664`	`663`	`if ($this->commandLoader) {`
`665`	`664`	`foreach ($this->commandLoader->getNames() as $name) {`
`666`	`665`	`if (!isset($commands[$name]) && $namespace === $this->extractNamespace($name, substr_count($namespace, ':') + 1)) {`
`667`		`- $commands[$name] = $this->commandLoader->get($name);`
	`666`	`+ $commands[$name] = $this->get($name);`
`668`	`667`	`}`
`669`	`668`	`}`
`670`	`669`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,8 @@ public function process(ContainerBuilder $container)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ $definition->addMethodCall('setName', array($commandName));`
	`91`	`+`
`90`	`92`	`if ($aliases) {`
`91`	`93`	`$definition->addMethodCall('setAliases', array($aliases));`
`92`	`94`	`}`