diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #17745 Added more exceptions to singularify method (javiereguiluz)

Browse Source 
This PR was merged into the 2.3 branch.

Discussion
----------

Added more exceptions to singularify method

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #16532
| License       | MIT
| Doc PR        | -

Added exceptions for `series`, `news` and `services`.

Commits
-------

f5daa0d Added more exceptions to singularify method
This commit is contained in:
Fabien Potencier 2016-02-12 07:37:13 +01:00
commit 92d291a17c
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/PropertyAccess/StringUtil.php
View File

@ -39,6 +39,9 @@ class StringUtil
// nebulae (nebula) // nebulae (nebula)
array('ea', 2, true, true, 'a'), array('ea', 2, true, true, 'a'),
// services (service)
array('secivres', 8, true, true, 'service'),
// mice (mouse), lice (louse) // mice (mouse), lice (louse)
array('eci', 3, false, true, 'ouse'), array('eci', 3, false, true, 'ouse'),
@ -66,6 +69,12 @@ class StringUtil
// movies (movie) // movies (movie)
array('seivom', 6, true, true, 'movie'), array('seivom', 6, true, true, 'movie'),
// news (news)
array('swen', 4, true, true, 'news'),
// series (series)
array('seires', 6, true, true, 'series'),
// babies (baby) // babies (baby)
array('sei', 3, false, true, 'y'), array('sei', 3, false, true, 'y'),

3
src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php
View File

@ -102,6 +102,7 @@ class StringUtilTest extends \PHPUnit_Framework_TestCase
array('movies', 'movie'), array('movies', 'movie'),
array('nebulae', 'nebula'), array('nebulae', 'nebula'),
array('neuroses', array('neuros', 'neurose', 'neurosis')), array('neuroses', array('neuros', 'neurose', 'neurosis')),
array('news', 'news'),
array('oases', array('oas', 'oase', 'oasis')), array('oases', array('oas', 'oase', 'oasis')),
array('objectives', 'objective'), array('objectives', 'objective'),
array('oxen', 'ox'), array('oxen', 'ox'),
@ -120,6 +121,8 @@ class StringUtilTest extends \PHPUnit_Framework_TestCase
array('scarves', array('scarf', 'scarve', 'scarff')), array('scarves', array('scarf', 'scarve', 'scarff')),
array('schemas', 'schema'), //schemata array('schemas', 'schema'), //schemata
array('selfies', 'selfie'), array('selfies', 'selfie'),
array('series', 'series'),
array('services', 'service'),
array('sheriffs', 'sheriff'), array('sheriffs', 'sheriff'),
array('shoes', array('sho', 'shoe')), array('shoes', array('sho', 'shoe')),
array('spies', 'spy'), array('spies', 'spy'),