Skip to content

S
syncEnrollments
Commit 2e482d31 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Refactoring the inflector.

parent 5862faf2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 16 deletions
system/inflector.php
View file @ 2e482d31
...@@ -121,15 +121,9 @@ class Inflector { ...@@ -121,15 +121,9 @@ class Inflector {
*/ */
public static function plural($value) public static function plural($value)
{ {
if (array_key_exists($value, static::$plural_cache)) if (array_key_exists($value, static::$plural_cache)) return static::$plural_cache[$value];
{
return static::$plural_cache[$value];
}
if (in_array(strtolower($value), static::$uncountable)) if (in_array(strtolower($value), static::$uncountable)) return static::$plural_cache[$value] = $value;
{
return static::$plural_cache[$value] = $value;
}
foreach (static::$irregular as $pattern => $irregular) foreach (static::$irregular as $pattern => $irregular)
{ {
...@@ -160,15 +154,9 @@ class Inflector { ...@@ -160,15 +154,9 @@ class Inflector {
*/ */
public static function singular($value) public static function singular($value)
{ {
if (array_key_exists($value, static::$singular_cache)) if (array_key_exists($value, static::$singular_cache)) return static::$singular_cache[$value];
{
return static::$singular_cache[$value];
}
if (in_array(strtolower($value), static::$uncountable)) if (in_array(strtolower($value), static::$uncountable)) return static::$singular_cache[$value] = $value;
{
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