mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-19 02:56:15 +00:00
Removing Inflector's inheritance on Object, as it was unecessary.
Adding irregular waves => wave missed in merge from 1.2
This commit is contained in:
parent
e5083b88c4
commit
f764c53c55
1 changed files with 5 additions and 11 deletions
|
@ -20,14 +20,6 @@
|
|||
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
|
||||
*/
|
||||
|
||||
/**
|
||||
* Included libraries.
|
||||
*
|
||||
*/
|
||||
if (!class_exists('Object')) {
|
||||
require_once(LIBS . 'object.php');
|
||||
}
|
||||
|
||||
/**
|
||||
* Pluralize and singularize English words.
|
||||
*
|
||||
|
@ -38,7 +30,7 @@ if (!class_exists('Object')) {
|
|||
* @subpackage cake.cake.libs
|
||||
* @link http://book.cakephp.org/view/491/Inflector
|
||||
*/
|
||||
class Inflector extends Object {
|
||||
class Inflector {
|
||||
|
||||
/**
|
||||
* Plural inflector rules
|
||||
|
@ -153,7 +145,9 @@ class Inflector extends Object {
|
|||
'uninflected' => array(
|
||||
'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', '.*ss'
|
||||
),
|
||||
'irregular' => array()
|
||||
'irregular' => array(
|
||||
'waves' => 'wave'
|
||||
)
|
||||
);
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Reference in a new issue