merged branch jjanvier/master (PR #8943)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8943).

Discussion
----------

[PropertyAccess] Fixing singular form for kisses, accesses and addresses.

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

Plural form of noums finishing by *sses* is always *ss* (contrary to plural form of noums finishing by *ses*).

Commits
-------

ebae88f Fixing singular form for kisses, accesses and addresses.
This commit is contained in:
Fabien Potencier 2013-09-06 16:56:44 +02:00
commit a42ad21003
2 changed files with 7 additions and 2 deletions

View File

@ -63,10 +63,13 @@ class StringUtil
// babies (baby)
array('sei', 3, false, true, 'y'),
// accesses (access), addresses (address), kisses (kiss)
array('sess', 4, true, false, 'ss'),
// analyses (analysis), ellipses (ellipsis), funguses (fungus),
// neuroses (neurosis), theses (thesis), emphases (emphasis),
// oases (oasis), crises (crisis), houses (house), bases (base),
// atlases (atlas), kisses (kiss)
// atlases (atlas)
array('ses', 3, true, true, array('s', 'se', 'sis')),
// objectives (objective), alternative (alternatives)

View File

@ -75,7 +75,9 @@ class StringUtilTest extends \PHPUnit_Framework_TestCase
array('heroes', array('hero', 'heroe')),
array('hoaxes', 'hoax'),
array('irises', array('iris', 'irise', 'irisis')),
array('kisses', array('kiss', 'kisse', 'kissis')),
array('kisses', 'kiss'),
array('addresses', 'address'),
array('accesses', 'access'),
array('knives', 'knife'),
array('lives', 'life'),
array('lice', 'louse'),