Merge branch '6.3' into 6.4

* 6.3: [Serializer] Fix normalization relying on allowed attributes only [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 [String] Fix Inflector for 'icon'
symfony · Nov 28, 2023 · b45fcf3 · b45fcf3
2 parents 6c4c7ed + 5642788
commit b45fcf3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Inflector/EnglishInflector.php b/Inflector/EnglishInflector.php
@@ -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'],
 

diff --git a/Tests/Inflector/EnglishInflectorTest.php b/Tests/Inflector/EnglishInflectorTest.php
@@ -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'],