adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 11:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring singularize/pluralize to use an in-memory array map for better performance.

Browse source
This commit is contained in:
jperras 2009-04-10 13:03:38 -04:00
parent dd55afe57f
commit f466929aca
1 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
cake/libs/inflector.php
View file

@ -230,10 +230,11 @@ class Inflector extends Object {
foreach ($rules as $rule => $pattern) { foreach ($rules as $rule => $pattern) {
if (is_array($pattern)) { if (is_array($pattern)) {
$_this->{$type}[$rule] = array_merge($pattern, $_this->{$type}[$rule]); $_this->{$type}[$rule] = array_merge($pattern, $_this->{$type}[$rule]);
unset($rules[$rule], $_this->{$type}['cache' . ucfirst($rule)]); unset($rules[$rule], $_this->{$type}['cache' . ucfirst($rule)], $_this->{$type}['merged'][$rule]);
} }
} }
$_this->{$type}['rules'] = array_merge($rules, $_this->{$type}['rules']); $_this->{$type}['rules'] = array_merge($rules, $_this->{$type}['rules']);
} }
/** /**
* Return $word in plural form. * Return $word in plural form.
@ -251,16 +252,21 @@ class Inflector extends Object {
return $_this->pluralized[$word]; return $_this->pluralized[$word];
} }
extract($_this->plural); if (!isset($_this->plural['merged']['irregular'])) {
$uninflected = array_merge($uninflected, $_this->uninflected); $_this->plural['merged']['irregular'] = $_this->plural['irregular'];
}
if (!isset($_this->plural['merged']['uninflected'])) {
$_this->plural['merged']['uninflected'] = array_merge($_this->plural['uninflected'], $_this->uninflected);
}
if (!isset($_this->plural['cacheUninflected']) || !isset($_this->plural['cacheIrregular'])) { if (!isset($_this->plural['cacheUninflected']) || !isset($_this->plural['cacheIrregular'])) {
$_this->plural['cacheUninflected'] = '(?:' . join( '|', $uninflected) . ')'; $_this->plural['cacheUninflected'] = '(?:' . join( '|', $_this->plural['merged']['uninflected']) . ')';
$_this->plural['cacheIrregular'] = '(?:' . join( '|', array_keys($irregular)) . ')'; $_this->plural['cacheIrregular'] = '(?:' . join( '|', array_keys($_this->plural['merged']['irregular'])) . ')';
} }
if (preg_match('/(.*)\\b(' . $_this->plural['cacheIrregular'] . ')$/i', $word, $regs)) { if (preg_match('/(.*)\\b(' . $_this->plural['cacheIrregular'] . ')$/i', $word, $regs)) {
$_this->pluralized[$word] = $regs[1] . substr($word, 0, 1) . substr($irregular[strtolower($regs[2])], 1); $_this->pluralized[$word] = $regs[1] . substr($word, 0, 1) . substr($_this->plural['merged']['irregular'][strtolower($regs[2])], 1);
return $_this->pluralized[$word]; return $_this->pluralized[$word];
} }
@ -269,7 +275,7 @@ class Inflector extends Object {
return $word; return $word;
} }
foreach ($rules as $rule => $replacement) { foreach ($_this->plural['rules'] as $rule => $replacement) {
if (preg_match($rule, $word)) { if (preg_match($rule, $word)) {
$_this->pluralized[$word] = preg_replace($rule, $replacement, $word); $_this->pluralized[$word] = preg_replace($rule, $replacement, $word);
return $_this->pluralized[$word]; return $_this->pluralized[$word];
@ -293,17 +299,21 @@ class Inflector extends Object {
return $_this->singularized[$word]; return $_this->singularized[$word];
} }
extract($_this->singular); if (!isset($_this->singular['merged']['uninflected'])) {
$uninflected = array_merge($uninflected, $_this->uninflected); $_this->singular['merged']['uninflected'] = array_merge($_this->singular['uninflected'], $_this->uninflected);
$irregular = array_merge($irregular, array_flip($_this->plural['irregular'])); }
if (!isset($_this->singular['merged']['irregular'])) {
$_this->singular['merged']['irregular'] = array_merge($_this->singular['irregular'], array_flip($_this->plural['irregular']));
}
if (!isset($_this->singular['cacheUninflected']) || !isset($_this->singular['cacheIrregular'])) { if (!isset($_this->singular['cacheUninflected']) || !isset($_this->singular['cacheIrregular'])) {
$_this->singular['cacheUninflected'] = '(?:' . join( '|', $uninflected) . ')'; $_this->singular['cacheUninflected'] = '(?:' . join( '|', $_this->singular['merged']['uninflected']) . ')';
$_this->singular['cacheIrregular'] = '(?:' . join( '|', array_keys($irregular)) . ')'; $_this->singular['cacheIrregular'] = '(?:' . join( '|', array_keys($_this->singular['merged']['irregular'])) . ')';
} }
if (preg_match('/(.*)\\b(' . $_this->singular['cacheIrregular'] . ')$/i', $word, $regs)) { if (preg_match('/(.*)\\b(' . $_this->singular['cacheIrregular'] . ')$/i', $word, $regs)) {
$_this->singularized[$word] = $regs[1] . substr($word, 0, 1) . substr($irregular[strtolower($regs[2])], 1); $_this->singularized[$word] = $regs[1] . substr($word, 0, 1) . substr($_this->singular['merged']['irregular'][strtolower($regs[2])], 1);
return $_this->singularized[$word]; return $_this->singularized[$word];
} }
@ -312,7 +322,7 @@ class Inflector extends Object {
return $word; return $word;
} }
foreach ($rules as $rule => $replacement) { foreach ($_this->singular['rules'] as $rule => $replacement) {
if (preg_match($rule, $word)) { if (preg_match($rule, $word)) {
$_this->singularized[$word] = preg_replace($rule, $replacement, $word); $_this->singularized[$word] = preg_replace($rule, $replacement, $word);
return $_this->singularized[$word]; return $_this->singularized[$word];