bug #42009 [Console] Fix save correct name in setDefaultCommand() for PHP8 (a1812)

fabpot · fabpot · commit 4a033926f59c · 2021-07-08T15:26:43.000+02:00
This PR was merged into the 5.3 branch. Discussion ---------- [Console] Fix save correct name in setDefaultCommand() for PHP8 | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #41942 | License | MIT | Doc PR | Fix save correct name in setDefaultCommand() for PHP8 Commits ------- 8a41694 fix setDefaultCommand
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -1147,7 +1147,7 @@ private function findAlternatives(string $name, iterable $collection): array
      */
     public function setDefaultCommand(string $commandName, bool $isSingleCommand = false)
     {
-        $this->defaultCommand = $commandName;
+        $this->defaultCommand = explode('|', ltrim($commandName, '|'))[0];
 
         if ($isSingleCommand) {
             // Ensure the command exist
diff --git a/src/Symfony/Component/Console/Tests/Command/CommandTest.php b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
@@ -422,6 +422,25 @@ public function testCommandAttribute()
         $this->assertTrue($command->isHidden());
         $this->assertSame(['f'], $command->getAliases());
     }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testDefaultCommand()
+    {
+        $apl = new Application();
+        $apl->setDefaultCommand(Php8Command::getDefaultName());
+        $property = new \ReflectionProperty($apl, 'defaultCommand');
+        $property->setAccessible(true);
+
+        $this->assertEquals('foo', $property->getValue($apl));
+
+        $apl->setDefaultCommand(Php8Command2::getDefaultName());
+        $property = new \ReflectionProperty($apl, 'defaultCommand');
+        $property->setAccessible(true);
+
+        $this->assertEquals('foo2', $property->getValue($apl));
+    }
 }
 
 // In order to get an unbound closure, we should create it outside a class
@@ -437,3 +456,8 @@ function createClosure()
 class Php8Command extends Command
 {
 }
+
+#[AsCommand(name: 'foo2', description: 'desc2', hidden: true)]
+class Php8Command2 extends Command
+{
+}

Original file line number	Diff line number	Diff line change
`@@ -1147,7 +1147,7 @@ private function findAlternatives(string $name, iterable $collection): array`
`1147`	`1147`	`*/`
`1148`	`1148`	`public function setDefaultCommand(string $commandName, bool $isSingleCommand = false)`
`1149`	`1149`	`{`
`1150`		`- $this->defaultCommand = $commandName;`
	`1150`	`+ $this->defaultCommand = explode('\|', ltrim($commandName, '\|'))[0];`
`1151`	`1151`
`1152`	`1152`	`if ($isSingleCommand) {`
`1153`	`1153`	`// Ensure the command exist`