From 1b41a987fa3959ee2c6c9e515ac3b9cc28eb7f89 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 12 Aug 2010 20:26:11 -0400
Subject: [PATCH] Adding test cases and fixing inflection issues with bases. 
 Tests added.  Fixes #1012

---
 cake/libs/inflector.php                  | 2 +-
 cake/tests/cases/libs/inflector.test.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index dc0f78f6b..9cae3a1d2 100644
--- 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
index 519b39978..3cec57e12 100644
--- a/cake/tests/cases/libs/inflector.test.php
+++ b/cake/tests/cases/libs/inflector.test.php
@@ -112,6 +112,9 @@ class InflectorTest extends CakeTestCase {
 		$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(''), '');
 	}