Merge branch '6.4' into 7.0

* 6.4: [Console] Allow false as a $shortcut in InputOption [MonologBridge] Support symfony/security-core 5.4 again Fix plurial of word ending by pus
symfony · Feb 1, 2024 · 019186b · 019186b
2 parents c5010d5 + 86386d4
commit 019186b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Input/InputOption.php b/Input/InputOption.php
@@ -75,7 +75,7 @@ public function __construct(string $name, string|array|null $shortcut = null, ?i
             throw new InvalidArgumentException('An option name cannot be empty.');
         }
 
-        if ('' === $shortcut || [] === $shortcut) {
+        if ('' === $shortcut || [] === $shortcut || false === $shortcut) {
             $shortcut = null;
         }
 

diff --git a/Tests/Input/InputOptionTest.php b/Tests/Input/InputOptionTest.php
@@ -73,6 +73,8 @@ public function testShortcut()
         $this->assertEquals('0|z', $option->getShortcut(), '-0 is an acceptable shortcut value when embedded in an array');
         $option = new InputOption('foo', '0|z');
         $this->assertEquals('0|z', $option->getShortcut(), '-0 is an acceptable shortcut value when embedded in a string-list');
+        $option = new InputOption('foo', false);
+        $this->assertNull($option->getShortcut(), '__construct() makes the shortcut null when given a false as value');
     }
 
     public function testModes()