From 1bccc7713d810cae430c337fddd1ec729293041c Mon Sep 17 00:00:00 2001 From: ADmad <admad.coder@gmail.com> Date: Thu, 7 Jul 2011 23:08:03 +0530 Subject: [PATCH] Fixing singularization of "curves" --- lib/Cake/Test/Case/Utility/InflectorTest.php | 1 + lib/Cake/Utility/Inflector.php | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Cake/Test/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php index 226ba1ebb..d8d010d4f 100644 --- a/lib/Cake/Test/Case/Utility/InflectorTest.php +++ b/lib/Cake/Test/Case/Utility/InflectorTest.php @@ -106,6 +106,7 @@ class InflectorTest extends CakeTestCase { $this->assertEqual(Inflector::singularize('diagnoses'), 'diagnosis'); $this->assertEqual(Inflector::singularize('bases'), 'basis'); $this->assertEqual(Inflector::singularize('analyses'), 'analysis'); + $this->assertEqual(Inflector::singularize('curves'), 'curve'); $this->assertEqual(Inflector::singularize(''), ''); } diff --git a/lib/Cake/Utility/Inflector.php b/lib/Cake/Utility/Inflector.php index 1b0733586..83f305d4e 100644 --- a/lib/Cake/Utility/Inflector.php +++ b/lib/Cake/Utility/Inflector.php @@ -143,7 +143,8 @@ class Inflector { '.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', '.*ss' ), 'irregular' => array( - 'waves' => 'wave' + 'waves' => 'wave', + 'curves' => 'curve' ) ); @@ -397,14 +398,14 @@ class Inflector { if (!isset(self::$_singular['merged']['uninflected'])) { self::$_singular['merged']['uninflected'] = array_merge( - self::$_singular['uninflected'], + self::$_singular['uninflected'], self::$_uninflected ); } if (!isset(self::$_singular['merged']['irregular'])) { self::$_singular['merged']['irregular'] = array_merge( - self::$_singular['irregular'], + self::$_singular['irregular'], array_flip(self::$_plural['irregular']) ); }