Updating the Pluralizer class to respect the grammar rule (#25063)

[5.6] When count is -1, word must be in the singular
laravel · Aug 3, 2018 · 7a7b58d · 7a7b58d
1 parent f294134
commit 7a7b58d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Illuminate/Support/Pluralizer.php b/src/Illuminate/Support/Pluralizer.php
@@ -64,7 +64,7 @@ class Pluralizer
      */
     public static function plural($value, $count = 2)
     {
-        if ((int) $count === 1 || static::uncountable($value)) {
+        if ((int) abs($count) === 1 || static::uncountable($value)) {
             return $value;
         }
 

diff --git a/tests/Support/SupportPluralizerTest.php b/tests/Support/SupportPluralizerTest.php
@@ -39,4 +39,11 @@ public function testIfEndOfWordPlural()
         $this->assertEquals('IndexFields', Str::plural('IndexField'));
         $this->assertEquals('VertexFields', Str::plural('VertexField'));
     }
+
+    public function testPluralWithNegativeCount() {
+        $this->assertEquals('test', Str::plural('test', 1));
+        $this->assertEquals('tests', Str::plural('test', 2));
+        $this->assertEquals('test', Str::plural('test', -1));
+        $this->assertEquals('tests', Str::plural('test', -2));
+    }
 }