fix backwards-compatibility with overridden add() methods

xabbuh · nicolas-grekas · commit de0b107e3cf1 · 2025-06-16T08:35:25.000+02:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -1352,8 +1352,14 @@ private function init(): void
         }
         $this->initialized = true;
 
+        if ((new \ReflectionMethod($this, 'add'))->getDeclaringClass()->getName() !== (new \ReflectionMethod($this, 'addCommand'))->getDeclaringClass()->getName()) {
+            $adder = $this->add(...);
+        } else {
+            $adder = $this->addCommand(...);
+        }
+
         foreach ($this->getDefaultCommands() as $command) {
-            $this->addCommand($command);
+            $adder($command);
         }
     }
 }
diff --git a/src/Symfony/Component/Runtime/SymfonyRuntime.php b/src/Symfony/Component/Runtime/SymfonyRuntime.php
@@ -162,10 +162,11 @@ public function getRunner(?object $application): RunnerInterface
 
             if (!$application->getName() || !$console->has($application->getName())) {
                 $application->setName($_SERVER['argv'][0]);
-                if (method_exists($console, 'addCommand')) {
-                    $console->addCommand($application);
-                } else {
+
+                if (!method_exists($console, 'addCommand') || (new \ReflectionMethod($console, 'add'))->getDeclaringClass()->getName() !== (new \ReflectionMethod($console, 'addCommand'))->getDeclaringClass()->getName()) {
                     $console->add($application);
+                } else {
+                    $console->addCommand($application);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1352,8 +1352,14 @@ private function init(): void`
`1352`	`1352`	`}`
`1353`	`1353`	`$this->initialized = true;`
`1354`	`1354`
	`1355`	`+ if ((new \ReflectionMethod($this, 'add'))->getDeclaringClass()->getName() !== (new \ReflectionMethod($this, 'addCommand'))->getDeclaringClass()->getName()) {`
	`1356`	`+ $adder = $this->add(...);`
	`1357`	`+ } else {`
	`1358`	`+ $adder = $this->addCommand(...);`
	`1359`	`+ }`
	`1360`	`+`
`1355`	`1361`	`foreach ($this->getDefaultCommands() as $command) {`
`1356`		`- $this->addCommand($command);`
	`1362`	`+ $adder($command);`
`1357`	`1363`	`}`
`1358`	`1364`	`}`
`1359`	`1365`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,10 +162,11 @@ public function getRunner(?object $application): RunnerInterface`
`162`	`162`
`163`	`163`	`if (!$application->getName() \|\| !$console->has($application->getName())) {`
`164`	`164`	`$application->setName($_SERVER['argv'][0]);`
`165`		`- if (method_exists($console, 'addCommand')) {`
`166`		`- $console->addCommand($application);`
`167`		`- } else {`
	`165`	`+`
	`166`	`+ if (!method_exists($console, 'addCommand') \|\| (new \ReflectionMethod($console, 'add'))->getDeclaringClass()->getName() !== (new \ReflectionMethod($console, 'addCommand'))->getDeclaringClass()->getName()) {`
`168`	`167`	`$console->add($application);`
	`168`	`+ } else {`
	`169`	`+ $console->addCommand($application);`
`169`	`170`	`}`
`170`	`171`	`}`
`171`	`172`