Fix dynamic disabling of lazy-loaded commands

platformsh · Dec 5, 2024 · 60afea4 · 60afea4
1 parent e123f1c
commit 60afea4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -320,6 +320,10 @@ protected function configureIO(InputInterface $input, OutputInterface $output):
      */
     protected function doRunCommand(ConsoleCommand $command, InputInterface $input, OutputInterface $output): int
     {
+        if (!$command->isEnabled()) {
+            throw new \InvalidArgumentException(sprintf('The command "%s" is not enabled.', $command->getName()));
+        }
+
         if ($command instanceof MultiAwareInterface) {
             $command->setRunningViaMulti($this->runningViaMulti);
         }

diff --git a/src/Console/CustomMarkdownDescriptor.php b/src/Console/CustomMarkdownDescriptor.php
@@ -41,7 +41,7 @@ protected function describeApplication(Application $application, array $options
                 if ($command instanceof LazyCommand) {
                     $command = $command->getCommand();
                 }
-                if ($command->isHidden()) {
+                if ($command->isHidden() || !$command->isEnabled()) {
                     unset($namespace['commands'][$key]);
                     continue;
                 }

diff --git a/src/Console/CustomTextDescriptor.php b/src/Console/CustomTextDescriptor.php
@@ -123,7 +123,7 @@ protected function describeApplication(ConsoleApplication $application, array $o
                     }
 
                     // Ensure the command is only shown under its canonical name.
-                    if ($name === $command->getName() && !$command->isHidden()) {
+                    if ($name === $command->getName() && !$command->isHidden() && $command->isEnabled()) {
                         $commands[$name] = $command;
                     }
                 }