bug #13618 [PropertyAccess] Fixed invalid feedback -> foodback singularization (WouterJ)

fabpot · fabpot · commit ee47901456d2 · 2015-02-16T10:25:34.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [PropertyAccess] Fixed invalid feedback -> foodback singularization | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #13613 | License | MIT | Doc PR | - Commits ------- bc50125 Fixed invalid feedback -> foodback singularization
diff --git a/src/Symfony/Component/PropertyAccess/StringUtil.php b/src/Symfony/Component/PropertyAccess/StringUtil.php
@@ -197,7 +197,7 @@ public static function singularify($plural)
         }
 
         // Convert teeth to tooth, feet to foot
-        if (false !== ($pos = strpos($plural, 'ee')) && strlen($plural) > 3) {
+        if (false !== ($pos = strpos($plural, 'ee')) && strlen($plural) > 3 && 'feedback' !== $plural) {
             return substr_replace($plural, 'oo', $pos, 2);
         }
 
diff --git a/src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php b/src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php
@@ -59,6 +59,7 @@ public function singularifyProvider()
             array('data', array('daton', 'datum')),
             array('days', 'day'),
             array('discos', 'disco'),
+            array('devices', array('devex', 'devix', 'device')),
             array('drives', 'drive'),
             array('drivers', 'driver'),
             array('dwarves', array('dwarf', 'dwarve', 'dwarff')),
@@ -67,6 +68,7 @@ public function singularifyProvider()
             array('emphases', array('emphas', 'emphase', 'emphasis')),
             array('faxes', 'fax'),
             array('feet', 'foot'),
+            array('feedback', 'feedback'),
             array('foci', 'focus'),
             array('focuses', array('focus', 'focuse', 'focusis')),
             array('formulae', 'formula'),

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public static function singularify($plural)`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`// Convert teeth to tooth, feet to foot`
`200`		`- if (false !== ($pos = strpos($plural, 'ee')) && strlen($plural) > 3) {`
	`200`	`+ if (false !== ($pos = strpos($plural, 'ee')) && strlen($plural) > 3 && 'feedback' !== $plural) {`
`201`	`201`	`return substr_replace($plural, 'oo', $pos, 2);`
`202`	`202`	`}`
`203`	`203`