Skip to content

Commit 6cd670a

Browse files
committed
Merge branch '6.4' into 7.1
* 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 ...
2 parents ea272a8 + 5bc3eb6 commit 6cd670a

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

Inflector/EnglishInflector.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ final class EnglishInflector implements InflectorInterface
3737
// curricula (curriculum)
3838
['alucirruc', 9, true, true, 'curriculum'],
3939

40+
// quora (quorum)
41+
['arouq', 5, true, true, 'quorum'],
42+
4043
// genera (genus)
4144
['areneg', 6, true, true, 'genus'],
4245

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

127+
// article (articles), ancle (ancles)
128+
['sel', 3, true, true, 'le'],
129+
124130
// analyses (analysis), ellipses (ellipsis), fungi (fungus),
125131
// neuroses (neurosis), theses (thesis), emphases (emphasis),
126132
// oases (oasis), crises (crisis), houses (house), bases (base),
@@ -265,6 +271,9 @@ final class EnglishInflector implements InflectorInterface
265271
// albums (album)
266272
['mubla', 5, true, true, 'albums'],
267273

274+
// quorums (quorum)
275+
['murouq', 6, true, true, ['quora', 'quorums']],
276+
268277
// bacteria (bacterium), curricula (curriculum), media (medium), memoranda (memorandum), phenomena (phenomenon), strata (stratum)
269278
['mu', 2, true, true, 'a'],
270279

Tests/Inflector/EnglishInflectorTest.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ public static function singularizeProvider()
2828
['alumnae', 'alumna'],
2929
['alumni', 'alumnus'],
3030
['analyses', ['analys', 'analyse', 'analysis']],
31+
['ankles', 'ankle'],
3132
['antennae', 'antenna'],
3233
['antennas', 'antenna'],
3334
['appendices', ['appendex', 'appendix', 'appendice']],
3435
['arches', ['arch', 'arche']],
36+
['articles', 'article'],
3537
['atlases', ['atlas', 'atlase', 'atlasis']],
3638
['axes', ['ax', 'axe', 'axis']],
3739
['babies', 'baby'],
@@ -134,6 +136,8 @@ public static function singularizeProvider()
134136
['poppies', 'poppy'],
135137
['prices', ['prex', 'prix', 'price']],
136138
['quizzes', 'quiz'],
139+
['quora', 'quorum'],
140+
['quorums', 'quorum'],
137141
['radii', 'radius'],
138142
['roofs', 'roof'],
139143
['roses', ['ros', 'rose', 'rosis']],
@@ -189,9 +193,11 @@ public static function pluralizeProvider()
189193
['album', 'albums'],
190194
['alumnus', 'alumni'],
191195
['analysis', 'analyses'],
196+
['ankle', 'ankles'],
192197
['antenna', 'antennas'], // antennae
193198
['appendix', ['appendicies', 'appendixes']],
194199
['arch', 'arches'],
200+
['article', 'articles'],
195201
['atlas', 'atlases'],
196202
['axe', 'axes'],
197203
['axis', 'axes'],
@@ -285,6 +291,7 @@ public static function pluralizeProvider()
285291
['poppy', 'poppies'],
286292
['price', 'prices'],
287293
['quiz', 'quizzes'],
294+
['quorum', ['quora', 'quorums']],
288295
['radius', 'radii'],
289296
['roof', ['roofs', 'rooves']],
290297
['rose', 'roses'],

0 commit comments

Comments
 (0)