Fixed incorrect regular plural for -ves words

Fixes singularization for words like caves (cave), staves (staff).
symfony · May 16, 2014 · c7a77c5 · c7a77c5
1 parent 6207389
commit c7a77c5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/Symfony/Component/PropertyAccess/StringUtil.php b/src/Symfony/Component/PropertyAccess/StringUtil.php
@@ -81,8 +81,8 @@ class StringUtil
         // moves (move)
         array('sevom', 5, true, true, 'move'),
 
-        // hooves (hoof), dwarves (dwarf), elves (elf), leaves (leaf)
-        array('sev', 3, true, true, 'f'),
+        // hooves (hoof), dwarves (dwarf), elves (elf), leaves (leaf), caves (cave), staves (staff)
+        array('sev', 3, true, true, array('f', 've', 'ff')),
 
         // axes (axis), axes (ax), axes (axe)
         array('sexa', 4, false, false, array('ax', 'axe', 'axis')),

diff --git a/src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php b/src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php
@@ -38,7 +38,7 @@ public function singularifyProvider()
             array('feet', 'foot'),
             array('nebulae', 'nebula'),
             array('babies', 'baby'),
-            array('hooves', 'hoof'),
+            array('hooves', array('hoof', 'hoove', 'hooff')),
             array('chateaux', 'chateau'),
             array('echoes', array('echo', 'echoe')),
             array('analyses', array('analys', 'analyse', 'analysis')),
@@ -64,14 +64,14 @@ public function singularifyProvider()
             array('batches', array('batch', 'batche')),
             array('bushes', array('bush', 'bushe')),
             array('buses', array('bus', 'buse', 'busis')),
-            array('calves', 'calf'),
+            array('calves', array('calf', 'calve', 'calff')),
             array('circuses', array('circus', 'circuse', 'circusis')),
             array('crises', array('cris', 'crise', 'crisis')),
-            array('dwarves', 'dwarf'),
-            array('elves', 'elf'),
+            array('dwarves', array('dwarf', 'dwarve', 'dwarff')),
+            array('elves', array('elf', 'elve', 'elff')),
             array('emphases', array('emphas', 'emphase', 'emphasis')),
             array('faxes', 'fax'),
-            array('halves', 'half'),
+            array('halves', array('half', 'halve', 'halff')),
             array('heroes', array('hero', 'heroe')),
             array('hoaxes', 'hoax'),
             array('irises', array('iris', 'irise', 'irisis')),
@@ -86,13 +86,15 @@ public function singularifyProvider()
             array('plateaux', 'plateau'),
             array('poppies', 'poppy'),
             array('quizzes', 'quiz'),
-            array('scarves', 'scarf'),
+            array('scarves', array('scarf', 'scarve', 'scarff')),
             array('spies', 'spy'),
             array('stories', 'story'),
             array('syllabi', 'syllabus'),
-            array('thieves', 'thief'),
+            array('thieves', array('thief', 'thieve', 'thieff')),
             array('waltzes', array('waltz', 'waltze')),
-            array('wharves', 'wharf'),
+            array('wharves', array('wharf', 'wharve', 'wharff')),
+            array('caves', array('caf', 'cave', 'caff')),
+            array('staves', array('staf', 'stave', 'staff')),
             array('wives', 'wife'),
             array('ions', 'ion'),
             array('bases', array('bas', 'base', 'basis')),