bug #41105 [Inflector][String] Fixed singularize edges > edge (ruudk)

derrabus · derrabus · commit 68ee96d37132 · 2021-05-04T19:40:55.000+02:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [Inflector][String] Fixed singularize `edges` > `edge` | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT I noticed that calling `$inflector->singularize('edges');` returned `['edg', 'edges']`. It should be `edge`, only. See https://en.wiktionary.org/wiki/edge Commits ------- ebfb0c9 [Inflector][String] Fixed singularize `edges` > `edge`
diff --git a/src/Symfony/Component/Inflector/Inflector.php b/src/Symfony/Component/Inflector/Inflector.php
@@ -123,6 +123,9 @@ final class Inflector
         // fees (fee), trees (tree), employees (employee)
         ['see', 3, true, true, 'ee'],
 
+        // edges (edge)
+        ['segd', 4, true, true, 'dge'],
+
         // roses (rose), garages (garage), cassettes (cassette),
         // waltzes (waltz), heroes (hero), bushes (bush), arches (arch),
         // shoes (shoe)
@@ -314,14 +317,32 @@ final class Inflector
      */
     private const UNINFLECTED = [
         '',
+
+        // data
         'atad',
+
+        // deer
         'reed',
+
+        // feedback
         'kcabdeef',
+
+        // fish
         'hsif',
+
+        // info
         'ofni',
+
+        // moose
         'esoom',
+
+        // series
         'seires',
+
+        // sheep
         'peehs',
+
+        // species
         'seiceps',
     ];
 
diff --git a/src/Symfony/Component/Inflector/Tests/InflectorTest.php b/src/Symfony/Component/Inflector/Tests/InflectorTest.php
@@ -66,6 +66,7 @@ public function singularizeProvider()
             ['drivers', 'driver'],
             ['dwarves', ['dwarf', 'dwarve', 'dwarff']],
             ['echoes', ['echo', 'echoe']],
+            ['edges', 'edge'],
             ['elves', ['elf', 'elve', 'elff']],
             ['emphases', ['emphas', 'emphase', 'emphasis']],
             ['employees', 'employee'],
@@ -210,6 +211,7 @@ public function pluralizeProvider()
             ['driver', 'drivers'],
             ['dwarf', ['dwarfs', 'dwarves']],
             ['echo', 'echoes'],
+            ['edge', 'edges'],
             ['elf', ['elfs', 'elves']],
             ['emphasis', 'emphases'],
             ['fax', ['facies', 'faxes']],
