Merge pull request #242 from doctrine/2.0.x-merge-up-into-2.1.x_9obhxGeY

Merge release 2.0.9 into 2.1.x
doctrine · Jan 15, 2024 · d718c58 · d718c58
2 parents d62dadc + 2930cd5
commit d718c58
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -14,11 +14,20 @@ jobs:
     name: "Roave BC Check"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: fetch tags
-        run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: Roave BC Check
-        uses: docker://nyholm/roave-bc-check-ga
+      - uses: "actions/checkout@v3"
+        with:
+          fetch-depth: 0
+
+      - name: Install PHP with extensions.
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "8.2"
+
+      - name: Install roave/backward-compatibility-check.
+        run: composer require --dev roave/backward-compatibility-check
+
+      - name: Run roave/backward-compatibility-check.
+        run: vendor/bin/roave-backward-compatibility-check
 
   phpunit:
     name: "PHPUnit"

diff --git a/lib/Doctrine/Inflector/Rules/English/Inflectible.php b/lib/Doctrine/Inflector/Rules/English/Inflectible.php
@@ -93,6 +93,7 @@ public static function getPlural(): iterable
     public static function getIrregular(): iterable
     {
         yield new Substitution(new Word('atlas'), new Word('atlases'));
+        yield new Substitution(new Word('axis'), new Word('axes'));
         yield new Substitution(new Word('axe'), new Word('axes'));
         yield new Substitution(new Word('beef'), new Word('beefs'));
         yield new Substitution(new Word('blouse'), new Word('blouses'));
@@ -104,13 +105,15 @@ public static function getIrregular(): iterable
         yield new Substitution(new Word('child'), new Word('children'));
         yield new Substitution(new Word('canvas'), new Word('canvases'));
         yield new Substitution(new Word('cookie'), new Word('cookies'));
+        yield new Substitution(new Word('brownie'), new Word('brownies'));
         yield new Substitution(new Word('corpus'), new Word('corpuses'));
         yield new Substitution(new Word('cow'), new Word('cows'));
         yield new Substitution(new Word('criterion'), new Word('criteria'));
         yield new Substitution(new Word('curriculum'), new Word('curricula'));
         yield new Substitution(new Word('demo'), new Word('demos'));
         yield new Substitution(new Word('domino'), new Word('dominoes'));
         yield new Substitution(new Word('echo'), new Word('echoes'));
+        yield new Substitution(new Word('epoch'), new Word('epochs'));
         yield new Substitution(new Word('foot'), new Word('feet'));
         yield new Substitution(new Word('fungus'), new Word('fungi'));
         yield new Substitution(new Word('ganglion'), new Word('ganglions'));

diff --git a/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php b/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php
@@ -83,6 +83,7 @@ public function dataSampleWords(): array
             ['congoese', 'congoese'],
             ['contretemps', 'contretemps'],
             ['cookie', 'cookies'],
+            ['brownie', 'brownies'],
             ['copy', 'copies'],
             ['coreopsis', 'coreopsis'],
             ['corps', 'corps'],
@@ -117,6 +118,7 @@ public function dataSampleWords(): array
             ['emphasis', 'emphases'],
             ['employee-child', 'employee-children'],
             ['energy', 'energies'],
+            ['epoch', 'epochs'],
             ['equipment', 'equipment'],
             ['evidence', 'evidence'],
             ['experience', 'experiences'],
@@ -388,6 +390,7 @@ public function dataSingularsUninflectedWhenSingularized(): array
             ['fascia', 'fascium'],
             ['status', 'statu'],
             ['campus', 'campu'],
+            ['axis', 'axes'],
         ];
     }