[String] Fix #54611 pluralization of -on ending words + singularization of -a ending foreign words

Author: Geordie

Tests/InflectorTest.php

@@ -37,7 +37,7 @@ public static function singularizeProvider()
             ['atlases', ['atlas', 'atlase', 'atlasis']],
             ['axes', ['ax', 'axe', 'axis']],
             ['babies', 'baby'],
-            ['bacteria', ['bacterion', 'bacterium']],
+            ['bacteria', 'bacterium'],
             ['bases', ['bas', 'base', 'basis']],
             ['batches', ['batch', 'batche']],
             ['beaux', 'beau'],
@@ -48,6 +48,7 @@ public static function singularizeProvider()
             ['bureaux', 'bureau'],
             ['buses', ['bus', 'buse', 'busis']],
             ['bushes', ['bush', 'bushe']],
+            ['buttons', 'button'],
             ['calves', ['calf', 'calve', 'calff']],
             ['cars', 'car'],
             ['cassettes', ['cassett', 'cassette']],
@@ -58,10 +59,12 @@ public static function singularizeProvider()
             ['circuses', ['circus', 'circuse', 'circusis']],
             ['cliffs', 'cliff'],
             ['committee', 'committee'],
+            ['corpora', 'corpus'],
+            ['coupons', 'coupon'],
             ['crises', ['cris', 'crise', 'crisis']],
-            ['criteria', ['criterion', 'criterium']],
+            ['criteria', 'criterion'],
             ['cups', 'cup'],
-            ['coupons', 'coupon'],
+            ['curricula', 'curriculum'],
             ['data', 'data'],
             ['days', 'day'],
             ['discos', 'disco'],
@@ -87,6 +90,7 @@ public static function singularizeProvider()
             ['funguses', ['fungus', 'funguse', 'fungusis']],
             ['garages', ['garag', 'garage']],
             ['geese', 'goose'],
+            ['genera', 'genus'],
             ['halves', ['half', 'halve', 'halff']],
             ['hats', 'hat'],
             ['heroes', ['hero', 'heroe']],
@@ -107,6 +111,8 @@ public static function singularizeProvider()
             ['lives', 'life'],
             ['matrices', ['matrex', 'matrix', 'matrice']],
             ['matrixes', 'matrix'],
+            ['media', 'medium'],
+            ['memoranda', 'memorandum'],
             ['men', 'man'],
             ['mice', 'mouse'],
             ['moves', 'move'],
@@ -120,7 +126,7 @@ public static function singularizeProvider()
             ['parties', 'party'],
             ['people', 'person'],
             ['persons', 'person'],
-            ['phenomena', ['phenomenon', 'phenomenum']],
+            ['phenomena', 'phenomenon'],
             ['photos', 'photo'],
             ['pianos', 'piano'],
             ['plateaux', 'plateau'],
@@ -144,7 +150,7 @@ public static function singularizeProvider()
             ['spies', 'spy'],
             ['staves', ['staf', 'stave', 'staff']],
             ['stories', 'story'],
-            ['strata', ['straton', 'stratum']],
+            ['strata', 'stratum'],
             ['suitcases', ['suitcas', 'suitcase', 'suitcasis']],
             ['syllabi', 'syllabus'],
             ['tags', 'tag'],
@@ -195,7 +201,9 @@ public static function pluralizeProvider()
             ['bureau', ['bureaus', 'bureaux']],
             ['bus', 'buses'],
             ['bush', 'bushes'],
+            ['button', 'buttons'],
             ['calf', ['calfs', 'calves']],
+            ['campus', 'campuses'],
             ['car', 'cars'],
             ['cassette', 'cassettes'],
             ['cave', 'caves'],
@@ -205,10 +213,11 @@ public static function pluralizeProvider()
             ['circus', 'circuses'],
             ['cliff', 'cliffs'],
             ['committee', 'committees'],
+            ['coupon', 'coupons'],
             ['crisis', 'crises'],
-            ['criteria', 'criterion'],
+            ['criterion', 'criteria'],
             ['cup', 'cups'],
-            ['coupon', 'coupons'],
+            ['curriculum', 'curricula'],
             ['data', 'data'],
             ['day', 'days'],
             ['disco', 'discos'],
@@ -232,10 +241,12 @@ public static function pluralizeProvider()
             ['half', ['halfs', 'halves']],
             ['hat', 'hats'],
             ['hero', 'heroes'],
+            ['hippocampus', 'hippocampi'],
             ['hippopotamus', 'hippopotami'], // hippopotamuses
             ['hoax', 'hoaxes'],
             ['hoof', ['hoofs', 'hooves']],
             ['house', 'houses'],
+            ['icon', 'icons'],
             ['index', ['indicies', 'indexes']],
             ['ion', 'ions'],
             ['iris', 'irises'],
@@ -248,6 +259,8 @@ public static function pluralizeProvider()
             ['louse', 'lice'],
             ['man', 'men'],
             ['matrix', ['matricies', 'matrixes']],
+            ['medium', 'media'],
+            ['memorandum', 'memoranda'],
             ['mouse', 'mice'],
             ['move', 'moves'],
             ['movie', 'movies'],

composer.json

@@ -26,7 +26,7 @@
         "php": ">=7.2.5",
         "symfony/deprecation-contracts": "^2.1|^3",
         "symfony/polyfill-php80": "^1.16",
-        "symfony/string": "^5.3.10|^6.0"
+        "symfony/string": "^5.4.41|^6.4.9"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Inflector\\": "" },