Merge pull request #244 from doctrine/2.0.x-merge-up-into-2.1.x_ZcxM93zp

Merge release 2.0.10 into 2.1.x
doctrine · Feb 18, 2024 · f587d8c · f587d8c
2 parents d718c58 + 5817d06
commit f587d8c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/Doctrine/Inflector/Rules/English/Inflectible.php b/lib/Doctrine/Inflector/Rules/English/Inflectible.php
@@ -47,7 +47,7 @@ public static function getSingular(): iterable
         yield new Transformation(new Pattern('(analy|diagno|^ba|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$'), '\1\2sis');
         yield new Transformation(new Pattern('(tax)a$'), '\1on');
         yield new Transformation(new Pattern('(c)riteria$'), '\1riterion');
-        yield new Transformation(new Pattern('([ti])a$'), '\1um');
+        yield new Transformation(new Pattern('([ti])a(?<!regatta)$'), '\1um');
         yield new Transformation(new Pattern('(p)eople$'), '\1\2erson');
         yield new Transformation(new Pattern('(m)en$'), '\1an');
         yield new Transformation(new Pattern('(c)hildren$'), '\1\2hild');

diff --git a/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php b/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php
@@ -233,9 +233,11 @@ public function dataSampleWords(): array
             ['old_news', 'old_news'],
             ['olive', 'olives'],
             ['ox', 'oxen'],
+            ['pactum', 'pacta'],
             ['pants', 'pants'],
             ['pass', 'passes'],
             ['passerby', 'passersby'],
+            ['pasta', 'pastas'],
             ['patience', 'patience'],
             ['pekingese', 'pekingese'],
             ['person', 'people'],
@@ -264,6 +266,7 @@ public function dataSampleWords(): array
             ['radius', 'radii'],
             ['rain', 'rain'],
             ['reflex', 'reflexes'],
+            ['regatta', 'regattas'],
             ['research', 'research'],
             ['rhinoceros', 'rhinoceros'],
             ['rice', 'rice'],
@@ -314,6 +317,7 @@ public function dataSampleWords(): array
             ['stimulus', 'stimuli'],
             ['stitch', 'stitches'],
             ['story', 'stories'],
+            ['stratum', 'strata'],
             ['sugar', 'sugar'],
             ['swine', 'swine'],
             ['switch', 'switches'],
@@ -387,8 +391,13 @@ public function dataSingularsUninflectedWhenSingularized(): array
             ['utopia', 'utopium'],
             ['sepia', 'sepium'],
             ['mafia', 'mafium'],
+            ['regatta', 'regattum'],
+            ['regattas', 'regattum'],
+            ['pactum', 'pactums'],
             ['fascia', 'fascium'],
             ['status', 'statu'],
+            ['stratum', 'strati'],
+            ['stratum', 'stratums'],
             ['campus', 'campu'],
             ['axis', 'axes'],
         ];