Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit 504b5077057f · 2024-02-01T14:16:41.000+01:00
* 5.4:
  [Console] Allow false as a $shortcut in InputOption
  Fix plurial of word ending by pus
diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/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/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php b/src/Symfony/Component/Console/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()
diff --git a/src/Symfony/Component/String/Inflector/EnglishInflector.php b/src/Symfony/Component/String/Inflector/EnglishInflector.php
@@ -291,6 +291,12 @@ final class EnglishInflector implements InflectorInterface
         // circuses (circus)
         ['suc', 3, true, true, 'cuses'],
 
+        // hippocampi (hippocampus)
+        ['supmacoppih', 11, false, false, 'hippocampi'],
+
+        // campuses (campus)
+        ['sup', 3, true, true, 'puses'],
+
         // status (status)
         ['sutats', 6, true, true, ['status', 'statuses']],
 
diff --git a/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php b/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php
@@ -298,6 +298,8 @@ public static function pluralizeProvider()
             ['waltz', 'waltzes'],
             ['wife', 'wives'],
             ['icon', 'icons'],
+            ['hippocampus', 'hippocampi'],
+            ['campus', 'campuses'],
 
             // test casing: if the first letter was uppercase, it should remain so
             ['Man', 'Men'],

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function __construct(string $name, string\|array\|null $shortcut = null, ?i`
`75`	`75`	`throw new InvalidArgumentException('An option name cannot be empty.');`
`76`	`76`	`}`
`77`	`77`
`78`		`- if ('' === $shortcut \|\| [] === $shortcut) {`
	`78`	`+ if ('' === $shortcut \|\| [] === $shortcut \|\| false === $shortcut) {`
`79`	`79`	`$shortcut = null;`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,8 @@ public function testShortcut()`
`73`	`73`	`$this->assertEquals('0\|z', $option->getShortcut(), '-0 is an acceptable shortcut value when embedded in an array');`
`74`	`74`	`$option = new InputOption('foo', '0\|z');`
`75`	`75`	`$this->assertEquals('0\|z', $option->getShortcut(), '-0 is an acceptable shortcut value when embedded in a string-list');`
	`76`	`+ $option = new InputOption('foo', false);`
	`77`	`+ $this->assertNull($option->getShortcut(), '__construct() makes the shortcut null when given a false as value');`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`public function testModes()`