Skip to content

Commit

Permalink
Merge branch '6.4' into 7.1
Browse files Browse the repository at this point in the history
* 6.4: (23 commits)
  fix tests using Twig 3.12
  skip tests requiring the intl extension if it's not installed
  🐛 throw ParseException on invalid date
  fix permitted data type of the default choice
  [ExpressionLanguage] Improve test coverage
  Fix invalid phpdoc in ContainerBuilder
  [HttpKernel] [WebProfileBundle] Fix Routing panel for URLs with a colon
  [Form] NumberType: Fix parsing of numbers in exponential notation with negative exponent
  [Security] consistent singular/plural translation in Dutch
  reset the validation context after validating nested constraints
  do not duplicate directory separators
  fix handling empty data in ValueToDuplicatesTransformer
  fix compatibility with redis extension 6.0.3+
  synchronize unsupported scheme tests
  [String] Fixed Quorum plural, that was inflected to be only "Quora" and never "Quorums"
  Fix symfony/kaz-info-teh-notifier package
  [Validator] review latvian translations
  [Validator] Add Dutch translation for `WordCount` constraint
  allow more unicode characters in URL paths
  [String][EnglishInflector] Fix words ending in 'le', e.g., articles
  ...
  • Loading branch information
derrabus committed Aug 12, 2024
2 parents ea272a8 + 5bc3eb6 commit 6cd670a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
9 changes: 9 additions & 0 deletions Inflector/EnglishInflector.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ final class EnglishInflector implements InflectorInterface
// curricula (curriculum)
['alucirruc', 9, true, true, 'curriculum'],

// quora (quorum)
['arouq', 5, true, true, 'quorum'],

// genera (genus)
['areneg', 6, true, true, 'genus'],

Expand Down Expand Up @@ -121,6 +124,9 @@ final class EnglishInflector implements InflectorInterface
// statuses (status)
['sesutats', 8, true, true, 'status'],

// article (articles), ancle (ancles)
['sel', 3, true, true, 'le'],

// analyses (analysis), ellipses (ellipsis), fungi (fungus),
// neuroses (neurosis), theses (thesis), emphases (emphasis),
// oases (oasis), crises (crisis), houses (house), bases (base),
Expand Down Expand Up @@ -265,6 +271,9 @@ final class EnglishInflector implements InflectorInterface
// albums (album)
['mubla', 5, true, true, 'albums'],

// quorums (quorum)
['murouq', 6, true, true, ['quora', 'quorums']],

// bacteria (bacterium), curricula (curriculum), media (medium), memoranda (memorandum), phenomena (phenomenon), strata (stratum)
['mu', 2, true, true, 'a'],

Expand Down
7 changes: 7 additions & 0 deletions Tests/Inflector/EnglishInflectorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ public static function singularizeProvider()
['alumnae', 'alumna'],
['alumni', 'alumnus'],
['analyses', ['analys', 'analyse', 'analysis']],
['ankles', 'ankle'],
['antennae', 'antenna'],
['antennas', 'antenna'],
['appendices', ['appendex', 'appendix', 'appendice']],
['arches', ['arch', 'arche']],
['articles', 'article'],
['atlases', ['atlas', 'atlase', 'atlasis']],
['axes', ['ax', 'axe', 'axis']],
['babies', 'baby'],
Expand Down Expand Up @@ -134,6 +136,8 @@ public static function singularizeProvider()
['poppies', 'poppy'],
['prices', ['prex', 'prix', 'price']],
['quizzes', 'quiz'],
['quora', 'quorum'],
['quorums', 'quorum'],
['radii', 'radius'],
['roofs', 'roof'],
['roses', ['ros', 'rose', 'rosis']],
Expand Down Expand Up @@ -189,9 +193,11 @@ public static function pluralizeProvider()
['album', 'albums'],
['alumnus', 'alumni'],
['analysis', 'analyses'],
['ankle', 'ankles'],
['antenna', 'antennas'], // antennae
['appendix', ['appendicies', 'appendixes']],
['arch', 'arches'],
['article', 'articles'],
['atlas', 'atlases'],
['axe', 'axes'],
['axis', 'axes'],
Expand Down Expand Up @@ -285,6 +291,7 @@ public static function pluralizeProvider()
['poppy', 'poppies'],
['price', 'prices'],
['quiz', 'quizzes'],
['quorum', ['quora', 'quorums']],
['radius', 'radii'],
['roof', ['roofs', 'rooves']],
['rose', 'roses'],
Expand Down

0 comments on commit 6cd670a

Please sign in to comment.