Merge pull request #6243 from jtyost2/issue-6240-cake-2.6

Closes Issue 6240 for CakePHP 2.6 branch
This commit is contained in:
ADmad 2015-04-01 12:39:07 +05:30
commit 0249b38885
2 changed files with 4 additions and 1 deletions

View file

@ -177,6 +177,7 @@ class InflectorTest extends CakeTestCase {
$this->assertEquals(Inflector::singularize('body_curves'), 'body_curve'); $this->assertEquals(Inflector::singularize('body_curves'), 'body_curve');
$this->assertEquals(Inflector::singularize('metadata'), 'metadata'); $this->assertEquals(Inflector::singularize('metadata'), 'metadata');
$this->assertEquals(Inflector::singularize('files_metadata'), 'files_metadata'); $this->assertEquals(Inflector::singularize('files_metadata'), 'files_metadata');
$this->assertEquals(Inflector::singularize('sieves'), 'sieve');
$this->assertEquals(Inflector::singularize(''), ''); $this->assertEquals(Inflector::singularize(''), '');
} }
@ -248,6 +249,7 @@ class InflectorTest extends CakeTestCase {
$this->assertEquals(Inflector::pluralize('metadata'), 'metadata'); $this->assertEquals(Inflector::pluralize('metadata'), 'metadata');
$this->assertEquals(Inflector::pluralize('files_metadata'), 'files_metadata'); $this->assertEquals(Inflector::pluralize('files_metadata'), 'files_metadata');
$this->assertEquals(Inflector::pluralize('stadia'), 'stadia'); $this->assertEquals(Inflector::pluralize('stadia'), 'stadia');
$this->assertEquals(Inflector::pluralize('sieve'), 'sieves');
$this->assertEquals(Inflector::pluralize(''), ''); $this->assertEquals(Inflector::pluralize(''), '');
} }

View file

@ -107,7 +107,8 @@ class Inflector {
'hero' => 'heroes', 'hero' => 'heroes',
'tooth' => 'teeth', 'tooth' => 'teeth',
'goose' => 'geese', 'goose' => 'geese',
'foot' => 'feet' 'foot' => 'feet',
'sieve' => 'sieves'
) )
); );