[Inflector][String] Fix Notice when argument is empty string

moldman · moldman · commit e9620ad7fed8 · 2020-11-30T22:02:38.000+02:00
diff --git a/src/Symfony/Component/String/Inflector/EnglishInflector.php b/src/Symfony/Component/String/Inflector/EnglishInflector.php
@@ -325,8 +325,8 @@ public function singularize(string $plural): array
         $lowerPluralRev = strtolower($pluralRev);
         $pluralLength = \strlen($lowerPluralRev);
 
-        // Check if the word is one which is not inflected, return early if so
-        if (\in_array($lowerPluralRev, self::$uninflected, true)) {
+        // Check if the word is one which is not inflected or is an empty string, return early if so
+        if (\in_array($lowerPluralRev, self::$uninflected, true) || 0 === $pluralLength) {
             return [$plural];
         }
 
@@ -404,8 +404,8 @@ public function pluralize(string $singular): array
         $lowerSingularRev = strtolower($singularRev);
         $singularLength = \strlen($lowerSingularRev);
 
-        // Check if the word is one which is not inflected, return early if so
-        if (\in_array($lowerSingularRev, self::$uninflected, true)) {
+        // Check if the word is one which is not inflected or is an empty string, return early if so
+        if (\in_array($lowerSingularRev, self::$uninflected, true) || 0 === $singularLength) {
             return [$singular];
         }
 
diff --git a/src/Symfony/Component/String/Tests/EnglishInflectorTest.php b/src/Symfony/Component/String/Tests/EnglishInflectorTest.php
@@ -306,4 +306,16 @@ public function testPluralize(string $singular, $plural)
     {
         $this->assertSame(\is_array($plural) ? $plural : [$plural], (new EnglishInflector())->pluralize($singular));
     }
+
+    public function testPluralizeEmptyString()
+    {
+        $plural = (new EnglishInflector())->pluralize('');
+        $this->assertSame([''], $plural);
+    }
+
+    public function testSingularizeEmptyString()
+    {
+        $singular = (new EnglishInflector())->singularize('');
+        $this->assertSame([''], $singular);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -306,4 +306,16 @@ public function testPluralize(string $singular, $plural)`
`306`	`306`	`{`
`307`	`307`	`$this->assertSame(\is_array($plural) ? $plural : [$plural], (new EnglishInflector())->pluralize($singular));`
`308`	`308`	`}`
	`309`	`+`
	`310`	`+ public function testPluralizeEmptyString()`
	`311`	`+ {`
	`312`	`+ $plural = (new EnglishInflector())->pluralize('');`
	`313`	`+ $this->assertSame([''], $plural);`
	`314`	`+ }`
	`315`	`+`
	`316`	`+ public function testSingularizeEmptyString()`
	`317`	`+ {`
	`318`	`+ $singular = (new EnglishInflector())->singularize('');`
	`319`	`+ $this->assertSame([''], $singular);`
	`320`	`+ }`
`309`	`321`	`}`