Skip to content

Commit 5642788

Browse files
Merge branch '5.4' into 6.3
* 5.4: [Serializer] Fix normalization relying on allowed attributes only [Validator] Add missing translations for Bulgarian #51931 [String] Fix Inflector for 'icon'
2 parents de72e41 + 91bf445 commit 5642788

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Diff for: Inflector/EnglishInflector.php

+3
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,9 @@ final class EnglishInflector implements InflectorInterface
253253
// seasons (season), treasons (treason), poisons (poison), lessons (lesson)
254254
['nos', 3, true, true, 'sons'],
255255

256+
// icons (icon)
257+
['noc', 3, true, true, 'cons'],
258+
256259
// bacteria (bacterium), criteria (criterion), phenomena (phenomenon)
257260
['no', 2, true, true, 'a'],
258261

Diff for: Tests/Inflector/EnglishInflectorTest.php

+1
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ public static function pluralizeProvider()
295295
['tree', 'trees'],
296296
['waltz', 'waltzes'],
297297
['wife', 'wives'],
298+
['icon', 'icons'],
298299

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

0 commit comments

Comments
 (0)