From 2e482d31e42b0ec50ff0a5d3f7c16c232021b810 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 8 Aug 2011 09:08:52 -0500 Subject: [PATCH] Refactoring the inflector. --- system/inflector.php | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/system/inflector.php b/system/inflector.php index 44e0ca61..3b145a2a 100644 --- a/system/inflector.php +++ b/system/inflector.php @@ -121,15 +121,9 @@ class Inflector { */ public static function plural($value) { - if (array_key_exists($value, static::$plural_cache)) - { - return static::$plural_cache[$value]; - } + if (array_key_exists($value, static::$plural_cache)) return static::$plural_cache[$value]; - if (in_array(strtolower($value), static::$uncountable)) - { - return static::$plural_cache[$value] = $value; - } + if (in_array(strtolower($value), static::$uncountable)) return static::$plural_cache[$value] = $value; foreach (static::$irregular as $pattern => $irregular) { @@ -160,15 +154,9 @@ class Inflector { */ public static function singular($value) { - if (array_key_exists($value, static::$singular_cache)) - { - return static::$singular_cache[$value]; - } + if (array_key_exists($value, static::$singular_cache)) return static::$singular_cache[$value]; - if (in_array(strtolower($value), static::$uncountable)) - { - return static::$singular_cache[$value] = $value; - } + if (in_array(strtolower($value), static::$uncountable)) return static::$singular_cache[$value] = $value; foreach (static::$irregular as $irregular => $pattern) {