diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed incorrect regular plural for -ves words 

Fixes singularization for words like caves (cave), staves (staff).
This commit is contained in:
Charles Sarrazin 2014-05-16 11:21:11 +02:00
parent 6207389a6d
commit c7a77c55b7
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/PropertyAccess/StringUtil.php
View File

@ -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')),

18
src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php
View File

@ -38,7 +38,7 @@ class StringUtilTest extends \PHPUnit_Framework_TestCase
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 @@ class StringUtilTest extends \PHPUnit_Framework_TestCase
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 @@ class StringUtilTest extends \PHPUnit_Framework_TestCase
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')),