diff --git a/lib/Cake/Test/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php index dc923d63f43..337830debe6 100644 --- a/lib/Cake/Test/Case/Utility/InflectorTest.php +++ b/lib/Cake/Test/Case/Utility/InflectorTest.php @@ -117,6 +117,7 @@ public function testInflectingSingulars() { $this->assertEquals(Inflector::singularize('teeth'), 'tooth'); $this->assertEquals(Inflector::singularize('geese'), 'goose'); $this->assertEquals(Inflector::singularize('feet'), 'foot'); + $this->assertEquals(Inflector::singularize('objectives'), 'objective'); $this->assertEquals(Inflector::singularize(''), ''); } @@ -177,6 +178,7 @@ public function testInflectingPlurals() { $this->assertEquals(Inflector::pluralize('tooth'), 'teeth'); $this->assertEquals(Inflector::pluralize('goose'), 'geese'); $this->assertEquals(Inflector::pluralize('foot'), 'feet'); + $this->assertEquals(Inflector::pluralize('objective'), 'objectives'); $this->assertEquals(Inflector::pluralize(''), ''); } diff --git a/lib/Cake/Utility/Inflector.php b/lib/Cake/Utility/Inflector.php index 577bd0ad222..069eb2da948 100644 --- a/lib/Cake/Utility/Inflector.php +++ b/lib/Cake/Utility/Inflector.php @@ -125,9 +125,9 @@ class Inflector { '/(m)ovies$/i' => '\1\2ovie', '/(s)eries$/i' => '\1\2eries', '/([^aeiouy]|qu)ies$/i' => '\1y', + '/(tive)s$/i' => '\1', '/([lre])ves$/i' => '\1f', '/([^fo])ves$/i' => '\1fe', - '/(tive)s$/i' => '\1', '/(hive)s$/i' => '\1', '/(drive)s$/i' => '\1', '/(^analy)ses$/i' => '\1sis',