From d30019296b73598306465110fc5ad1e5b60aeb6d Mon Sep 17 00:00:00 2001 From: Daniil Suchkov <31596992+kyosheek@users.noreply.github.com> Date: Mon, 26 Jun 2023 20:03:01 +0600 Subject: [PATCH 1/5] add 'epoch' to irregular words list Add irregular word 'epoch' to list. Reference: https://www.britannica.com/dictionary/epoch --- lib/Doctrine/Inflector/Rules/English/Inflectible.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Doctrine/Inflector/Rules/English/Inflectible.php b/lib/Doctrine/Inflector/Rules/English/Inflectible.php index 806e175..a143a66 100644 --- a/lib/Doctrine/Inflector/Rules/English/Inflectible.php +++ b/lib/Doctrine/Inflector/Rules/English/Inflectible.php @@ -111,6 +111,7 @@ public static function getIrregular(): iterable 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')); From bb42c9aa325eefaee53235da42ac08aaf016f90f Mon Sep 17 00:00:00 2001 From: Daniil Suchkov <31596992+kyosheek@users.noreply.github.com> Date: Tue, 27 Jun 2023 16:26:19 +0600 Subject: [PATCH 2/5] add 'epoch' to EnglishFunctionalTest.php --- .../Tests/Inflector/Rules/English/EnglishFunctionalTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php b/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php index 9b3d157..4f92c19 100644 --- a/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php +++ b/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php @@ -117,6 +117,7 @@ public function dataSampleWords(): array ['emphasis', 'emphases'], ['employee-child', 'employee-children'], ['energy', 'energies'], + ['epoch', 'epochs'], ['equipment', 'equipment'], ['evidence', 'evidence'], ['experience', 'experiences'], From 6c00dd87923d75172ebee4f86cc588351c099708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sun, 20 Aug 2023 03:51:54 +0200 Subject: [PATCH 3/5] Ditch action in favor of running tool directly (#231) --- .github/workflows/continuous-integration.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 06b4220..11befd5 100644 --- 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" From 36218ffc9647efc5ce643e4fff5ca8a21def7716 Mon Sep 17 00:00:00 2001 From: Danny Cooper Date: Thu, 2 Nov 2023 14:30:48 +0000 Subject: [PATCH 4/5] Correct singularization of brownies --- lib/Doctrine/Inflector/Rules/English/Inflectible.php | 1 + .../Tests/Inflector/Rules/English/EnglishFunctionalTest.php | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/Doctrine/Inflector/Rules/English/Inflectible.php b/lib/Doctrine/Inflector/Rules/English/Inflectible.php index a143a66..ee3bae6 100644 --- a/lib/Doctrine/Inflector/Rules/English/Inflectible.php +++ b/lib/Doctrine/Inflector/Rules/English/Inflectible.php @@ -104,6 +104,7 @@ 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')); diff --git a/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php b/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php index 4f92c19..7f9d346 100644 --- 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'], From c2b0320e3ffd61f8b9e3d4d02f9bd159f2dfbebf Mon Sep 17 00:00:00 2001 From: Vladislav Iurciuc Date: Fri, 12 Jan 2024 11:51:16 +0200 Subject: [PATCH 5/5] Correct pluralization of axis --- lib/Doctrine/Inflector/Rules/English/Inflectible.php | 1 + .../Tests/Inflector/Rules/English/EnglishFunctionalTest.php | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/Doctrine/Inflector/Rules/English/Inflectible.php b/lib/Doctrine/Inflector/Rules/English/Inflectible.php index ee3bae6..04b6d00 100644 --- 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')); diff --git a/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php b/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php index 7f9d346..19df9e4 100644 --- a/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php +++ b/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php @@ -390,6 +390,7 @@ public function dataSingularsUninflectedWhenSingularized(): array ['fascia', 'fascium'], ['status', 'statu'], ['campus', 'campu'], + ['axis', 'axes'], ]; }