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

Removing Inflector's inheritance on Object, as it was unecessary.

Browse source 
Adding irregular waves => wave missed in merge from 1.2
This commit is contained in:
mark_story 2009-09-15 21:44:27 -04:00
parent e5083b88c4
commit f764c53c55
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cake/libs/inflector.php
View file

@ -20,14 +20,6 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @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. * Pluralize and singularize English words.
* *
@ -38,7 +30,7 @@ if (!class_exists('Object')) {
* @subpackage cake.cake.libs * @subpackage cake.cake.libs
* @link http://book.cakephp.org/view/491/Inflector * @link http://book.cakephp.org/view/491/Inflector
*/ */
class Inflector extends Object { class Inflector {
/** /**
* Plural inflector rules * Plural inflector rules
@ -152,8 +144,10 @@ class Inflector extends Object {
), ),
'uninflected' => array( 'uninflected' => array(
'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', '.*ss' '.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', '.*ss'
), ),
'irregular' => array() 'irregular' => array(
'waves' => 'wave'
)
); );
/** /**