Switched the conversion ee to oo to a whitelist approach

peterrehm · peterrehm · commit 91ab25a07ed2 · 2016-06-06T20:49:51.000+02:00
diff --git a/src/Symfony/Component/Inflector/Inflector.php b/src/Symfony/Component/Inflector/Inflector.php
@@ -70,6 +70,15 @@ final class Inflector
         // movies (movie)
         array('seivom', 6, true, true, 'movie'),
 
+        // feet (foot)
+        array('teef', 4, true, true, 'foot'),
+
+        // geese (goose)
+        array('eseeg', 5, true, true, 'goose'),
+
+        // teeth (tooth)
+        array('hteet', 5, true, true, 'tooth'),
+
         // news (news)
         array('swen', 4, true, true, 'news'),
 
@@ -130,17 +139,6 @@ final class Inflector
         array('elpoep', 6, true, true, 'person'),
     );
 
-    /**
-     * Irregular nouns which will not be converted 'ee' to 'oo'
-     *
-     * @var array
-     */
-    private static $irregularNouns = array(
-        'committee' => 'committee',
-        'feedback' => 'feedback',
-        'screenshots' => 'screenshot',
-    );
-
     /**
      * This class should not be instantiated.
      */
@@ -228,11 +226,6 @@ public static function singularize($plural)
             }
         }
 
-        // Convert teeth to tooth, feet to foot
-        if (false !== ($pos = strpos($plural, 'ee')) && strlen($plural) > 3 && !isset(self::$irregularNouns[strtolower($plural)])) {
-            return substr_replace($plural, 'oo', $pos, 2);
-        }
-
         // Assume that plural and singular is identical
         return $plural;
     }
