Refactored array to private static variable

peterrehm · peterrehm · commit 9c99398f0e61 · 2016-06-05T10:43:59.000+02:00
diff --git a/src/Symfony/Component/Inflector/Inflector.php b/src/Symfony/Component/Inflector/Inflector.php
@@ -130,6 +130,16 @@ 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',
+    );
+
     /**
      * This class should not be instantiated.
      */
@@ -223,7 +233,7 @@ public static function singularize($plural)
         );
 
         // Convert teeth to tooth, feet to foot
-        if (false !== ($pos = strpos($plural, 'ee')) && strlen($plural) > 3 && !isset($irregularNouns[strtolower($plural)])) {
+        if (false !== ($pos = strpos($plural, 'ee')) && strlen($plural) > 3 && !isset(self::$irregularNouns[strtolower($plural)])) {
             return substr_replace($plural, 'oo', $pos, 2);
         }
 
