Correct inflection rules for cookies, fixes fixes #3291

cakephp · Oct 22, 2012 · 9dc3b24 · 9dc3b24
1 parent 08556ab
commit 9dc3b24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Cake/Test/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php
@@ -109,6 +109,7 @@ public function testInflectingSingulars() {
 		$this->assertEquals(Inflector::singularize('roofs'), 'roof');
 		$this->assertEquals(Inflector::singularize('foes'), 'foe');
 		$this->assertEquals(Inflector::singularize('databases'), 'database');
+		$this->assertEquals(Inflector::singularize('cookies'), 'cookie');
 
 		$this->assertEquals(Inflector::singularize(''), '');
 	}
@@ -160,6 +161,7 @@ public function testInflectingPlurals() {
 		$this->assertEquals(Inflector::pluralize('cafe'), 'cafes');
 		$this->assertEquals(Inflector::pluralize('roof'), 'roofs');
 		$this->assertEquals(Inflector::pluralize('foe'), 'foes');
+		$this->assertEquals(Inflector::pluralize('cookie'), 'cookie');
 		$this->assertEquals(Inflector::pluralize(''), '');
 	}
 

diff --git a/lib/Cake/Utility/Inflector.php b/lib/Cake/Utility/Inflector.php
@@ -55,14 +55,15 @@ class Inflector {
 			'/$/' => 's',
 		),
 		'uninflected' => array(
-			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', 'people'
+			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', 'people', 'cookie'
 		),
 		'irregular' => array(
 			'atlas' => 'atlases',
 			'beef' => 'beefs',
 			'brother' => 'brothers',
 			'cafe' => 'cafes',
 			'child' => 'children',
+			'cookie' => 'cookies',
 			'corpus' => 'corpuses',
 			'cow' => 'cows',
 			'ganglion' => 'ganglions',