Fix singularization of 'foes'

Fixes #2424
cakephp · Jan 6, 2012 · e649a05 · e649a05
1 parent edf37e7
commit e649a05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/lib/Cake/Test/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php
@@ -108,6 +108,7 @@ public function testInflectingSingulars() {
 		$this->assertEquals(Inflector::singularize('curves'), 'curve');
 		$this->assertEquals(Inflector::singularize('cafes'), 'cafe');
 		$this->assertEquals(Inflector::singularize('roofs'), 'roof');
+		$this->assertEquals(Inflector::singularize('foes'), 'foe');
 
 		$this->assertEquals(Inflector::singularize(''), '');
 	}
@@ -158,6 +159,7 @@ public function testInflectingPlurals() {
 		$this->assertEquals(Inflector::pluralize('bureau'), 'bureaus');
 		$this->assertEquals(Inflector::pluralize('cafe'), 'cafes');
 		$this->assertEquals(Inflector::pluralize('roof'), 'roofs');
+		$this->assertEquals(Inflector::pluralize('foe'), 'foes');
 		$this->assertEquals(Inflector::pluralize(''), '');
 	}
 

diff --git a/lib/Cake/Utility/Inflector.php b/lib/Cake/Utility/Inflector.php
@@ -144,6 +144,7 @@ class Inflector {
 			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', '.*ss'
 		),
 		'irregular' => array(
+			'foes' => 'foe',
 			'waves' => 'wave',
 			'curves' => 'curve'
 		)