adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged:

Browse source 
[1681]

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1682 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2005-12-29 06:58:11 +00:00
parent b000ca5b9c
commit d29b4cd147
2 changed files with 83 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION.txt
View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ // // +---------------------------------------------------------------------------------------------------+ //
/////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////
0.10.4.1680_beta 0.10.4.1682_beta

167
cake/libs/inflector.php
View file

@ -60,95 +60,92 @@ class Inflector extends Object
} }
/** /**
* Return $word in plural form. * Return $word in plural form.
* *
* @param string $word Word in singular * @param string $word Word in singular
* @return string Word in plural * @return string Word in plural
*/ */
function pluralize ($word) function pluralize ($word)
{ {
$plural_rules = array( $plural_rules = array(
'/(s)tatus$/' => '\1\2tatuses', '/(s)tatus$/i' => '\1\2tatuses',
'/^(ox)$/' => '\1\2en', # ox '/^(ox)$/i' => '\1\2en', # ox
'/([m|l])ouse$/' => '\1ice', # mouse, louse '/([m|l])ouse$/i' => '\1ice', # mouse, louse
'/(matr|vert|ind)ix|ex$/' => '\1ices', # matrix, vertex, index '/(matr|vert|ind)ix|ex$/i' => '\1ices', # matrix, vertex, index
'/(x|ch|ss|sh)$/' => '\1es', # search, switch, fix, box, process, address '/(x|ch|ss|sh)$/i' => '\1es', # search, switch, fix, box, process, address
'/([^aeiouy]|qu)y$/' => '\1ies', # query, ability, agency '/([^aeiouy]|qu)y$/i' => '\1ies', # query, ability, agency
'/(hive)$/' => '\1s', # archive, hive '/(hive)$/i' => '\1s', # archive, hive
'/(?:([^f])fe|([lr])f)$/' => '\1\2ves', # half, safe, wife '/(?:([^f])fe|([lr])f)$/i' => '\1\2ves', # half, safe, wife
'/sis$/' => 'ses', # basis, diagnosis '/sis$/i' => 'ses', # basis, diagnosis
'/([ti])um$/' => '\1a', # datum, medium '/([ti])um$/i' => '\1a', # datum, medium
'/(p)erson$/' => '\1eople', # person, salesperson '/(p)erson$/i' => '\1eople', # person, salesperson
'/(m)an$/' => '\1en', # man, woman, spokesman '/(m)an$/i' => '\1en', # man, woman, spokesman
'/(c)hild$/' => '\1hildren', # child '/(c)hild$/i' => '\1hildren', # child
'/(buffal|tomat)o$/' => '\1\2oes', # buffalo, tomato '/(buffal|tomat)o$/i' => '\1\2oes', # buffalo, tomato
'/(bu)s$/' => '\1\2ses', # bus '/(bu)s$/i' => '\1\2ses', # bus
'/(alias)/' => '\1es', # alias '/(alias)/i' => '\1es', # alias
'/(octop|vir)us$/' => '\1i', # octopus, virus - virus has no defined plural (according to Latin/dictionary.com), but viri is better than viruses/viruss '/(octop|vir)us$/i' => '\1i', # octopus, virus - virus has no defined plural (according to Latin/dictionary.com), but viri is better than viruses/viruss
'/(ax|cri|test)is$/' => '\1es', # axis, crisis '/(ax|cri|test)is$/i' => '\1es', # axis, crisis
'/s$/' => 's', # no change (compatibility) '/s$/' => 's', # no change (compatibility)
'/$/' => 's' '/$/' => 's');
);
foreach ($plural_rules as $rule => $replacement) foreach ($plural_rules as $rule => $replacement)
{ {
if (preg_match($rule, $word)) if (preg_match($rule, $word))
{ {
return preg_replace($rule, $replacement, $word); return preg_replace($rule, $replacement, $word);
} }
} }
return $word;//false;
return $word;//false; }
}
/** /**
* Return $word in singular form. * Return $word in singular form.
* *
* @param string $word Word in plural * @param string $word Word in plural
* @return string Word in singular * @return string Word in singular
*/ */
function singularize ($word) function singularize ($word)
{ {
$singular_rules = array( $singular_rules = array(
'/(s)tatuses$/' => '\1\2tatus', '/(s)tatuses$/i' => '\1\2tatus',
'/(matr)ices$/' =>'\1ix', '/(matr)ices$/i' =>'\1ix',
'/(vert|ind)ices$/' => '\1ex', '/(vert|ind)ices$/i' => '\1ex',
'/^(ox)en/' => '\1', '/^(ox)en/i' => '\1',
'/(alias)es$/' => '\1', '/(alias)es$/i' => '\1',
'/([octop|vir])i$/' => '\1us', '/([octop|vir])i$/i' => '\1us',
'/(cris|ax|test)es$/' => '\1is', '/(cris|ax|test)es$/i' => '\1is',
'/(shoe)s$/' => '\1', '/(shoe)s$/i' => '\1',
'/(o)es$/' => '\1', '/(o)es$/i' => '\1',
'/(bus)es$/' => '\1', '/(bus)es$/i' => '\1',
'/([m|l])ice$/' => '\1ouse', '/([m|l])ice$/i' => '\1ouse',
'/(x|ch|ss|sh)es$/' => '\1', '/(x|ch|ss|sh)es$/i' => '\1',
'/(m)ovies$/' => '\1\2ovie', '/(m)ovies$/i' => '\1\2ovie',
'/(s)eries$/' => '\1\2eries', '/(s)eries$/i' => '\1\2eries',
'/([^aeiouy]|qu)ies$/' => '\1y', '/([^aeiouy]|qu)ies$/i' => '\1y',
'/([lr])ves$/' => '\1f', '/([lr])ves$/i' => '\1f',
'/(tive)s$/' => '\1', '/(tive)s$/i' => '\1',
'/(hive)s$/' => '\1', '/(hive)s$/i' => '\1',
'/([^f])ves$/' => '\1fe', '/([^f])ves$/i' => '\1fe',
'/(^analy)ses$/' => '\1sis', '/(^analy)ses$/i' => '\1sis',
'/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/' => '\1\2sis', '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
'/([ti])a$/' => '\1um', '/([ti])a$/i' => '\1um',
'/(p)eople$/' => '\1\2erson', '/(p)eople$/i' => '\1\2erson',
'/(m)en$/' => '\1an', '/(m)en$/i' => '\1an',
'/(c)hildren$/' => '\1\2hild', '/(c)hildren$/i' => '\1\2hild',
'/(n)ews$/' => '\1\2ews', '/(n)ews$/i' => '\1\2ews',
'/s$/' => '' '/s$/i' => '');
);
foreach ($singular_rules as $rule => $replacement) foreach ($singular_rules as $rule => $replacement)
{ {
if (preg_match($rule, $word)) if (preg_match($rule, $word))
{ {
return preg_replace($rule, $replacement, $word); return preg_replace($rule, $replacement, $word);
} }
} }
// should not return false is not matched // should not return false is not matched
return $word;//false; return $word;//false;
} }
/** /**
* Returns given $lower_case_and_underscored_word as a camelCased word. * Returns given $lower_case_and_underscored_word as a camelCased word.