Skip to content

Commit 7c89aba

Browse files
Merge branch '7.3' into 7.4
* 7.3: [Validator] Update Romanian translations fix tests [JsonStreamer] Fix decoding iterable lists [String][Inflector] Fix edge cases [Security] Fix attribute-based chained user providers [Intl] Fix Intl::getIcuStubVersion()
2 parents 324705b + de366af commit 7c89aba

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

Inflector/EnglishInflector.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ final class EnglishInflector implements InflectorInterface
2525
// Fourth entry: Whether the suffix may succeed a consonant
2626
// Fifth entry: singular suffix, normal
2727

28+
// insignias (insigne), insignia (insigne)
29+
['saingisni', 9, true, true, 'insigne'],
30+
['aingisni', 8, true, true, 'insigne'],
31+
32+
// passersby (passerby)
33+
['ybsressap', 9, true, true, 'passerby'],
34+
2835
// nodes (node)
2936
['sedon', 5, true, true, 'node'],
3037

@@ -205,6 +212,12 @@ final class EnglishInflector implements InflectorInterface
205212
// Fourth entry: Whether the suffix may succeed a consonant
206213
// Fifth entry: plural suffix, normal
207214

215+
// passerby (passersby)
216+
['ybressap', 8, true, true, 'passersby'],
217+
218+
// insigne (insignia, insignias)
219+
['engisni', 7, true, true, ['insignia', 'insignias']],
220+
208221
// nodes (node)
209222
['edon', 4, true, true, 'nodes'],
210223

Tests/Inflector/EnglishInflectorTest.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,16 +172,15 @@ public static function singularizeProvider()
172172
['waltzes', ['waltz', 'waltze']],
173173
['wives', 'wife'],
174174
['zombies', 'zombie'],
175+
['passersby', 'passerby'],
176+
['rattles', 'rattle'],
177+
['insignia', 'insigne'],
178+
['insignias', 'insigne'],
175179

176180
// test casing: if the first letter was uppercase, it should remain so
177181
['Men', 'Man'],
178182
['GrandChildren', 'GrandChild'],
179183
['SubTrees', 'SubTree'],
180-
181-
// Known issues
182-
// ['insignia', 'insigne'],
183-
// ['insignias', 'insigne'],
184-
// ['rattles', 'rattle'],
185184
];
186185
}
187186

@@ -263,6 +262,7 @@ public static function pluralizeProvider()
263262
['house', 'houses'],
264263
['icon', 'icons'],
265264
['index', ['indicies', 'indexes']],
265+
['insigne', ['insignia', 'insignias']],
266266
['ion', 'ions'],
267267
['iris', 'irises'],
268268
['issue', 'issues'],
@@ -288,6 +288,7 @@ public static function pluralizeProvider()
288288
['objective', 'objectives'],
289289
['ox', 'oxen'],
290290
['party', 'parties'],
291+
['passerby', 'passersby'],
291292
['person', ['persons', 'people']],
292293
['phenomenon', 'phenomena'],
293294
['photo', 'photos'],
@@ -299,6 +300,7 @@ public static function pluralizeProvider()
299300
['quiz', 'quizzes'],
300301
['quorum', ['quora', 'quorums']],
301302
['radius', 'radii'],
303+
['rattle', 'rattles'],
302304
['roof', ['roofs', 'rooves']],
303305
['rose', 'roses'],
304306
['sandwich', 'sandwiches'],

0 commit comments

Comments
 (0)