Skip to content

Commit

Permalink
Merge branch '7.0' into 7.1
Browse files Browse the repository at this point in the history
* 7.0: (23 commits)
  [Serializer] Fix anonymous test class
  [Translation] Improve tests coverage
  [Routing] Add redirection.io as sponsor of versions 6.4/7.0/7.1
  don't check parameter values if they are not set
  [HttpClient] Add Innovative Web AG (i-web) as sponsor of version 6.4/7.0
  [Serializer] Fix normalization relying on allowed attributes only
  Minor @var doc update
  [Translation] Remove `@internal` from abstract testcases
  [VarExporter] Work around php/php-src#12695 for lazy objects, fixing nullsafe-related behavior
  [Validator] Add missing translations for Bulgarian #51931
  [VarExporter] Fix serializing objects that implement __sleep() and that are made lazy
  remove not needed method existance check
  fix typo
  fix typo
  Document BC break with $secret parameter introduction
  Bump Symfony version to 7.0.0
  Update VERSION for 7.0.0-RC2
  Update CHANGELOG for 7.0.0-RC2
  Bump Symfony version to 6.4.0
  Update VERSION for 6.4.0-RC2
  ...
  • Loading branch information
nicolas-grekas committed Nov 29, 2023
2 parents 104f10a + 92bd2bf commit a15689c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Inflector/EnglishInflector.php
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,9 @@ final class EnglishInflector implements InflectorInterface
// seasons (season), treasons (treason), poisons (poison), lessons (lesson)
['nos', 3, true, true, 'sons'],

// icons (icon)
['noc', 3, true, true, 'cons'],

// bacteria (bacterium), criteria (criterion), phenomena (phenomenon)
['no', 2, true, true, 'a'],

Expand Down
1 change: 1 addition & 0 deletions Tests/Inflector/EnglishInflectorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ public static function pluralizeProvider()
['tree', 'trees'],
['waltz', 'waltzes'],
['wife', 'wives'],
['icon', 'icons'],

// test casing: if the first letter was uppercase, it should remain so
['Man', 'Men'],
Expand Down

0 comments on commit a15689c

Please sign in to comment.