Fix singularization of 'foes'

Fixes #2424
cakephp · Jan 6, 2012 · 049b04d · 049b04d
1 parent 5ac77c2
commit 049b04d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
@@ -148,6 +148,7 @@ class Inflector {
 			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', '.*ss'
 		),
 		'irregular' => array(
+			'foes' => 'foe',
 			'waves' => 'wave',
 			'curves' => 'curve'
 		)

diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php
@@ -119,6 +119,7 @@ function testInflectingSingulars() {
 		$this->assertEqual(Inflector::singularize('curves'), 'curve');
 		$this->assertEqual(Inflector::singularize('cafes'), 'cafe');
 		$this->assertEqual(Inflector::singularize('roofs'), 'roof');
+		$this->assertEqual(Inflector::singularize('foes'), 'foe');
 
 		$this->assertEqual(Inflector::singularize(''), '');
 	}
@@ -170,6 +171,7 @@ function testInflectingPlurals() {
 		$this->assertEqual(Inflector::pluralize('bureau'), 'bureaus');
 		$this->assertEqual(Inflector::pluralize('cafe'), 'cafes');
 		$this->assertEqual(Inflector::pluralize('roof'), 'roofs');
+		$this->assertEqual(Inflector::pluralize('foe'), 'foes');
 		$this->assertEqual(Inflector::pluralize(''), '');
 	}