[Console] Fix disabling lazy commands

Robin Chalas · Robin Chalas · commit 3b995e5fa40a · 2017-11-19T16:31:12.000+01:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -455,15 +455,12 @@ public function get($name)
     {
         $this->init();
 
-        if (isset($this->commands[$name])) {
-            $command = $this->commands[$name];
-        } elseif ($this->commandLoader && $this->commandLoader->has($name)) {
-            $command = $this->commandLoader->get($name);
-            $this->add($command);
-        } else {
+        if (!$this->has($name)) {
             throw new CommandNotFoundException(sprintf('The command "%s" does not exist.', $name));
         }
 
+        $command = $this->commands[$name];
+
         if ($this->wantHelps) {
             $this->wantHelps = false;
 
@@ -487,7 +484,7 @@ public function has($name)
     {
         $this->init();
 
-        return isset($this->commands[$name]) || ($this->commandLoader && $this->commandLoader->has($name));
+        return isset($this->commands[$name]) || ($this->commandLoader && $this->commandLoader->has($name) && $this->add($this->commandLoader->get($name)));
     }
 
     /**
@@ -650,7 +647,9 @@ public function all($namespace = null)
             $commands = $this->commands;
             foreach ($this->commandLoader->getNames() as $name) {
                 if (!isset($commands[$name])) {
-                    $commands[$name] = $this->get($name);
+                    if ($this->commandLoader->get($name)->isEnabled()) {
+                        $commands[$name] = $this->get($name);
+                    }
                 }
             }
 
@@ -667,7 +666,9 @@ 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->get($name);
+                    if ($this->commandLoader->get($name)->isEnabled()) {
+                        $commands[$name] = $this->get($name);
+                    }
                 }
             }
         }
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -1532,6 +1532,30 @@ public function testRunLazyCommandService()
         $this->assertSame(array('lazy:alias', 'lazy:alias2'), $command->getAliases());
     }
 
+    /**
+     * @expectedException \Symfony\Component\Console\Exception\CommandNotFoundException
+     */
+    public function testGetDisabledLazyCommand()
+    {
+        $application = new Application();
+        $application->setCommandLoader(new FactoryCommandLoader(array('disabled' => function () { return new DisabledCommand(); })));
+        $application->get('disabled');
+    }
+
+    public function testHasReturnsFalseForDisabledLazyCommand()
+    {
+        $application = new Application();
+        $application->setCommandLoader(new FactoryCommandLoader(array('disabled' => function () { return new DisabledCommand(); })));
+        $this->assertFalse($application->has('disabled'));
+    }
+
+    public function testAllExcludesDisabledLazyCommand()
+    {
+        $application = new Application();
+        $application->setCommandLoader(new FactoryCommandLoader(array('disabled' => function () { return new DisabledCommand(); })));
+        $this->assertArrayNotHasKey('disabled', $application->all());
+    }
+
     protected function getDispatcher($skipCommand = false)
     {
         $dispatcher = new EventDispatcher();
@@ -1634,3 +1658,11 @@ public function execute(InputInterface $input, OutputInterface $output)
         $output->writeln('lazy-command called');
     }
 }
+
+class DisabledCommand extends Command
+{
+    public function isEnabled()
+    {
+        return false;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -455,15 +455,12 @@ public function get($name)`
`455`	`455`	`{`
`456`	`456`	`$this->init();`
`457`	`457`
`458`		`- if (isset($this->commands[$name])) {`
`459`		`- $command = $this->commands[$name];`
`460`		`- } elseif ($this->commandLoader && $this->commandLoader->has($name)) {`
`461`		`- $command = $this->commandLoader->get($name);`
`462`		`- $this->add($command);`
`463`		`- } else {`
	`458`	`+ if (!$this->has($name)) {`
`464`	`459`	`throw new CommandNotFoundException(sprintf('The command "%s" does not exist.', $name));`
`465`	`460`	`}`
`466`	`461`
	`462`	`+ $command = $this->commands[$name];`
	`463`	`+`
`467`	`464`	`if ($this->wantHelps) {`
`468`	`465`	`$this->wantHelps = false;`
`469`	`466`
`@@ -487,7 +484,7 @@ public function has($name)`
`487`	`484`	`{`
`488`	`485`	`$this->init();`
`489`	`486`
`490`		`- return isset($this->commands[$name]) \|\| ($this->commandLoader && $this->commandLoader->has($name));`
	`487`	`+ return isset($this->commands[$name]) \|\| ($this->commandLoader && $this->commandLoader->has($name) && $this->add($this->commandLoader->get($name)));`
`491`	`488`	`}`
`492`	`489`
`493`	`490`	`/**`
`@@ -650,7 +647,9 @@ public function all($namespace = null)`
`650`	`647`	`$commands = $this->commands;`
`651`	`648`	`foreach ($this->commandLoader->getNames() as $name) {`
`652`	`649`	`if (!isset($commands[$name])) {`
`653`		`- $commands[$name] = $this->get($name);`
	`650`	`+ if ($this->commandLoader->get($name)->isEnabled()) {`
	`651`	`+ $commands[$name] = $this->get($name);`
	`652`	`+ }`
`654`	`653`	`}`
`655`	`654`	`}`
`656`	`655`
`@@ -667,7 +666,9 @@ public function all($namespace = null)`
`667`	`666`	`if ($this->commandLoader) {`
`668`	`667`	`foreach ($this->commandLoader->getNames() as $name) {`
`669`	`668`	`if (!isset($commands[$name]) && $namespace === $this->extractNamespace($name, substr_count($namespace, ':') + 1)) {`
`670`		`- $commands[$name] = $this->get($name);`
	`669`	`+ if ($this->commandLoader->get($name)->isEnabled()) {`
	`670`	`+ $commands[$name] = $this->get($name);`
	`671`	`+ }`
`671`	`672`	`}`
`672`	`673`	`}`
`673`	`674`	`}`