[Console] Run InvokableCommand via execute() method.

crynobone · crynobone · commit f4503b60f7eb · 2025-05-06T18:41:36.000+08:00
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
@@ -214,12 +214,16 @@ protected function configure()
      *
      * @return int 0 if everything went fine, or an exit code
      *
-     * @throws LogicException When this abstract method is not implemented
+     * @throws LogicException When this abstract method is not implemented or doesn't implement InvokableCommand
      *
      * @see setCode()
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
+        if ($this->code) {
+            return ($this->code)($input, $output);
+        }
+
         throw new LogicException('You must override the execute() method in the concrete command class.');
     }
 
@@ -311,10 +315,6 @@ public function run(InputInterface $input, OutputInterface $output): int
 
         $input->validate();
 
-        if ($this->code) {
-            return ($this->code)($input, $output);
-        }
-
         return $this->execute($input, $output);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -214,12 +214,16 @@ protected function configure()`
`214`	`214`	`*`
`215`	`215`	`* @return int 0 if everything went fine, or an exit code`
`216`	`216`	`*`
`217`		`- * @throws LogicException When this abstract method is not implemented`
	`217`	`+ * @throws LogicException When this abstract method is not implemented or doesn't implement InvokableCommand`
`218`	`218`	`*`
`219`	`219`	`* @see setCode()`
`220`	`220`	`*/`
`221`	`221`	`protected function execute(InputInterface $input, OutputInterface $output): int`
`222`	`222`	`{`
	`223`	`+ if ($this->code) {`
	`224`	`+ return ($this->code)($input, $output);`
	`225`	`+ }`
	`226`	`+`
`223`	`227`	`throw new LogicException('You must override the execute() method in the concrete command class.');`
`224`	`228`	`}`
`225`	`229`
`@@ -311,10 +315,6 @@ public function run(InputInterface $input, OutputInterface $output): int`
`311`	`315`
`312`	`316`	`$input->validate();`
`313`	`317`
`314`		`- if ($this->code) {`
`315`		`- return ($this->code)($input, $output);`
`316`		`- }`
`317`		`-`
`318`	`318`	`return $this->execute($input, $output);`
`319`	`319`	`}`
`320`	`320`