bug #54634 [String] Fix #54611 pluralization of -on ending words + singularization of -a ending foreign words (Geordie, DesLynx)

fabpot · fabpot · commit 2eb46eb5f8e7 · 2024-06-09T09:13:06.000+02:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [String] Fix #54611 pluralization of -on ending words + singularization of -a ending foreign words | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #54611 | License | MIT * fix the pluralization of -on ending words as -ons (with exception for "criterion" and "phenomenon") * fix singularization of -a ending foreign words (see https://english-zone.com/spelling/plurals.html) ![image](https://github.com/symfony/symfony/assets/72632819/ee32d12d-63b6-49ef-a815-4d9f1dc2d405) note: I left "data" uninflected because it seems to me that changing it to the datum/data inflection could cause side effects as "data" is a widely used word (especially in the coding world). * update the test suites (String component + deprecated Inflector component) according to the changes Commits ------- 91325ea [String] Fix #54611 pluralization of -on ending words + singularization of -a ending foreign words
diff --git a/src/Symfony/Component/Inflector/Tests/InflectorTest.php b/src/Symfony/Component/Inflector/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'],
diff --git a/src/Symfony/Component/Inflector/composer.json b/src/Symfony/Component/Inflector/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\\": "" },
diff --git a/src/Symfony/Component/String/Inflector/EnglishInflector.php b/src/Symfony/Component/String/Inflector/EnglishInflector.php
@@ -25,8 +25,32 @@ final class EnglishInflector implements InflectorInterface
         // Fourth entry: Whether the suffix may succeed a consonant
         // Fifth entry: singular suffix, normal
 
-        // bacteria (bacterium), criteria (criterion), phenomena (phenomenon)
-        ['a', 1, true, true, ['on', 'um']],
+        // bacteria (bacterium)
+        ['airetcab', 8, true, true, 'bacterium'],
+
+        // corpora (corpus)
+        ['aroproc', 7, true, true, 'corpus'],
+
+        // criteria (criterion)
+        ['airetirc', 8, true, true, 'criterion'],
+
+        // curricula (curriculum)
+        ['alucirruc', 9, true, true, 'curriculum'],
+
+        // genera (genus)
+        ['areneg', 6, true, true, 'genus'],
+
+        // media (medium)
+        ['aidem', 5, true, true, 'medium'],
+
+        // memoranda (memorandum)
+        ['adnaromem', 9, true, true, 'memorandum'],
+
+        // phenomena (phenomenon)
+        ['anemonehp', 9, true, true, 'phenomenon'],
+
+        // strata (stratum)
+        ['atarts', 6, true, true, 'stratum'],
 
         // nebulae (nebula)
         ['ea', 2, true, true, 'a'],
@@ -141,7 +165,7 @@ final class EnglishInflector implements InflectorInterface
         // shoes (shoe)
         ['se', 2, true, true, ['', 'e']],
 
-         // status (status)
+        // status (status)
         ['sutats', 6, true, true, 'status'],
 
         // tags (tag)
@@ -241,7 +265,7 @@ final class EnglishInflector implements InflectorInterface
         // albums (album)
         ['mubla', 5, true, true, 'albums'],
 
-        // bacteria (bacterium), criteria (criterion), phenomena (phenomenon)
+        // bacteria (bacterium), curricula (curriculum), media (medium), memoranda (memorandum), phenomena (phenomenon), strata (stratum)
         ['mu', 2, true, true, 'a'],
 
         // men (man), women (woman)
@@ -250,20 +274,11 @@ final class EnglishInflector implements InflectorInterface
         // people (person)
         ['nosrep', 6, true, true, ['persons', 'people']],
 
-        // bacteria (bacterium), criteria (criterion), phenomena (phenomenon)
-        ['noi', 3, true, true, 'ions'],
-
-        // coupon (coupons)
-        ['nop', 3, true, true, 'pons'],
-
-        // seasons (season), treasons (treason), poisons (poison), lessons (lesson)
-        ['nos', 3, true, true, 'sons'],
-
-        // icons (icon)
-        ['noc', 3, true, true, 'cons'],
+        // criteria (criterion)
+        ['noiretirc', 9, true, true, 'criteria'],
 
-        // bacteria (bacterium), criteria (criterion), phenomena (phenomenon)
-        ['no', 2, true, true, 'a'],
+        // phenomena (phenomenon)
+        ['nonemonehp', 10, true, true, 'phenomena'],
 
         // echoes (echo)
         ['ohce', 4, true, true, 'echoes'],
@@ -404,9 +419,6 @@ final class EnglishInflector implements InflectorInterface
         'erawdrah',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     public function singularize(string $plural): array
     {
         $pluralRev = strrev($plural);
@@ -438,7 +450,7 @@ public function singularize(string $plural): array
                 if ($j === $suffixLength) {
                     // Is there any character preceding the suffix in the plural string?
                     if ($j < $pluralLength) {
-                        $nextIsVowel = false !== strpos('aeiou', $lowerPluralRev[$j]);
+                        $nextIsVowel = str_contains('aeiou', $lowerPluralRev[$j]);
 
                         if (!$map[2] && $nextIsVowel) {
                             // suffix may not succeed a vowel but next char is one
@@ -483,9 +495,6 @@ public function singularize(string $plural): array
         return [$plural];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function pluralize(string $singular): array
     {
         $singularRev = strrev($singular);
@@ -518,7 +527,7 @@ public function pluralize(string $singular): array
                 if ($j === $suffixLength) {
                     // Is there any character preceding the suffix in the plural string?
                     if ($j < $singularLength) {
-                        $nextIsVowel = false !== strpos('aeiou', $lowerSingularRev[$j]);
+                        $nextIsVowel = str_contains('aeiou', $lowerSingularRev[$j]);
 
                         if (!$map[2] && $nextIsVowel) {
                             // suffix may not succeed a vowel but next char is one
diff --git a/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php b/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php
@@ -35,7 +35,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'],
@@ -46,6 +46,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']],
@@ -57,10 +58,12 @@ public static function singularizeProvider()
             ['cliffs', 'cliff'],
             ['codes', 'code'],
             ['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'],
@@ -86,6 +89,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']],
@@ -106,6 +110,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'],
@@ -146,7 +152,7 @@ public static function singularizeProvider()
             ['status', 'status'],
             ['statuses', 'status'],
             ['stories', 'story'],
-            ['strata', ['straton', 'stratum']],
+            ['strata', 'stratum'],
             ['suitcases', ['suitcas', 'suitcase', 'suitcasis']],
             ['syllabi', 'syllabus'],
             ['tags', 'tag'],
@@ -200,7 +206,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'],
@@ -210,10 +218,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'],
@@ -237,10 +246,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'],
@@ -253,6 +264,8 @@ public static function pluralizeProvider()
             ['louse', 'lice'],
             ['man', 'men'],
             ['matrix', ['matricies', 'matrixes']],
+            ['medium', 'media'],
+            ['memorandum', 'memoranda'],
             ['mouse', 'mice'],
             ['move', 'moves'],
             ['movie', 'movies'],
@@ -286,6 +299,7 @@ public static function pluralizeProvider()
             ['shoe', 'shoes'],
             ['species', 'species'],
             ['status', ['status', 'statuses']],
+            ['stratum', 'strata'],
             ['spy', 'spies'],
             ['staff', 'staves'],
             ['story', 'stories'],
