Commit afc80dd4 authored by Taylor Otwell's avatar Taylor Otwell

Refactor the inflector class.

parent e39ab9a0
...@@ -121,9 +121,15 @@ class Inflector { ...@@ -121,9 +121,15 @@ class Inflector {
*/ */
public static function plural($value) 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) foreach (static::$irregular as $pattern => $irregular)
{ {
...@@ -154,9 +160,15 @@ class Inflector { ...@@ -154,9 +160,15 @@ class Inflector {
*/ */
public static function singular($value) 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) foreach (static::$irregular as $irregular => $pattern)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment