Adding test cases and fixing inflection issues with bases. Tests added.

Fixes #1012
cakephp · Aug 13, 2010 · 1b41a98 · 1b41a98
1 parent d1028a7
commit 1b41a98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
@@ -133,7 +133,7 @@ class Inflector {
 			'/(drive)s$/i' => '\1',
 			'/([^fo])ves$/i' => '\1fe',
 			'/(^analy)ses$/i' => '\1sis',
-			'/(analy|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
+			'/(analy|ba|diagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
 			'/([ti])a$/i' => '\1um',
 			'/(p)eople$/i' => '\1\2erson',
 			'/(m)en$/i' => '\1an',

diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php
@@ -112,6 +112,9 @@ function testInflectingSingulars() {
 		$this->assertEqual(Inflector::singularize('parantheses'), 'paranthesis');
 		$this->assertEqual(Inflector::singularize('Causes'), 'Cause');
 		$this->assertEqual(Inflector::singularize('colossuses'), 'colossus');
+		$this->assertEqual(Inflector::singularize('diagnoses'), 'diagnosis');
+		$this->assertEqual(Inflector::singularize('bases'), 'basis');
+		$this->assertEqual(Inflector::singularize('analyses'), 'analysis');
 
 		$this->assertEqual(Inflector::singularize(''), '');
 	}