Merge pull request #330 from greg0ire/3.0.x

greg0ire · web-flow · commit e69af08ba8e9 · 2026-01-17T09:49:00.000+01:00
Merge 2.2.x up into 3.0.x
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -4,25 +4,25 @@
     "slug": "inflector",
     "docsSlug": "doctrine-inflector",
     "versions": [
+        {
+            "name": "2.2",
+            "branchName": "2.2.x",
+            "slug": "2.2",
+            "upcoming": true
+        },
         {
             "name": "2.1",
             "branchName": "2.1.x",
             "slug": "2.1",
-            "upcoming": true
+            "current": true
         },
         {
             "name": "2.0",
-            "branchName": "2.0.x",
             "slug": "2.0",
-            "current": true,
-            "aliases": [
-                "current",
-                "stable"
-            ]
+            "maintained": false
         },
         {
             "name": "1.4",
-            "branchName": "1.4.x",
             "slug": "1.4",
             "maintained": false
         },
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -12,4 +12,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.3.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@13.1.0"
diff --git a/.github/workflows/composer-lint.yml b/.github/workflows/composer-lint.yml
@@ -15,4 +15,4 @@ on:
 jobs:
   composer-lint:
     name: "Composer Lint"
-    uses: "doctrine/.github/.github/workflows/composer-lint.yml@7.3.0"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@13.1.0"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -14,7 +14,7 @@ jobs:
     name: "Roave BC Check"
     runs-on: ubuntu-latest
     steps:
-      - uses: "actions/checkout@v4"
+      - uses: "actions/checkout@v6"
         with:
           fetch-depth: 0
 
@@ -31,7 +31,7 @@ jobs:
 
   phpunit:
     name: "PHPUnit"
-    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@7.3.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@13.1.0"
     with:
       php-versions: '["8.4"]'
     secrets:
diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.3.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@13.1.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -12,4 +12,4 @@ on:
 jobs:
   static-analysis-phpstan:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.3.0"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@13.1.0"
diff --git a/.github/workflows/website-schema.yml b/.github/workflows/website-schema.yml
@@ -18,4 +18,4 @@ on:
 jobs:
   json-validate:
     name: "Validate JSON schema"
-    uses: "doctrine/.github/.github/workflows/website-schema.yml@7.3.0"
+    uses: "doctrine/.github/.github/workflows/website-schema.yml@13.1.0"
diff --git a/composer.json b/composer.json
@@ -42,11 +42,11 @@
         "php": "^8.4"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^13.0",
+        "doctrine/coding-standard": "^14.0",
         "phpstan/phpstan": "^2.0",
         "phpstan/phpstan-phpunit": "^2.0",
         "phpstan/phpstan-strict-rules": "^2.0",
-        "phpunit/phpunit": "^12.2"
+        "phpunit/phpunit": "^12.5.6"
     },
     "autoload": {
         "psr-4": {
diff --git a/docs/en/index.rst b/docs/en/index.rst
@@ -41,9 +41,11 @@ The supported languages are as follows:
 - ``Language::ENGLISH``
 - ``Language::ESPERANTO``
 - ``Language::FRENCH``
+- ``Language::ITALIAN``
 - ``Language::NORWEGIAN_BOKMAL``
 - ``Language::PORTUGUESE``
 - ``Language::SPANISH``
+- ``Language::SWEDISH``
 - ``Language::TURKISH``
 
 If you want to manually construct the inflector instead of using a factory, you can do so like this:
diff --git a/src/InflectorFactory.php b/src/InflectorFactory.php
@@ -11,6 +11,7 @@
 use Doctrine\Inflector\Rules\NorwegianBokmal;
 use Doctrine\Inflector\Rules\Portuguese;
 use Doctrine\Inflector\Rules\Spanish;
+use Doctrine\Inflector\Rules\Swedish;
 use Doctrine\Inflector\Rules\Turkish;
 use InvalidArgumentException;
 
@@ -47,6 +48,9 @@ public static function createForLanguage(string $language): LanguageInflectorFac
             case Language::SPANISH:
                 return new Spanish\InflectorFactory();
 
+            case Language::SWEDISH:
+                return new Swedish\InflectorFactory();
+
             case Language::TURKISH:
                 return new Turkish\InflectorFactory();
 
diff --git a/src/Language.php b/src/Language.php
@@ -13,6 +13,7 @@ final class Language
     public const string NORWEGIAN_BOKMAL = 'norwegian-bokmal';
     public const string PORTUGUESE       = 'portuguese';
     public const string SPANISH          = 'spanish';
+    public const string SWEDISH          = 'swedish';
     public const string TURKISH          = 'turkish';
 
     private function __construct()
diff --git a/src/Rules/Portuguese/Inflectible.php b/src/Rules/Portuguese/Inflectible.php
@@ -71,7 +71,7 @@ public static function getIrregular(): iterable
         yield new Substitution(new Word('chão'), new Word('chãos'));
         yield new Substitution(new Word('charlatão'), new Word('charlatães'));
         yield new Substitution(new Word('cidadão'), new Word('cidadãos'));
-        yield new Substitution(new Word('consul'), new Word('consules'));
+        yield new Substitution(new Word('cônsul'), new Word('cônsules'));
         yield new Substitution(new Word('cristão'), new Word('cristãos'));
         yield new Substitution(new Word('difícil'), new Word('difíceis'));
         yield new Substitution(new Word('email'), new Word('emails'));
@@ -85,6 +85,7 @@ public static function getIrregular(): iterable
         yield new Substitution(new Word('liquens'), new Word('liquen'));
         yield new Substitution(new Word('mal'), new Word('males'));
         yield new Substitution(new Word('mão'), new Word('mãos'));
+        yield new Substitution(new Word('mês'), new Word('meses'));
         yield new Substitution(new Word('orfão'), new Word('orfãos'));
         yield new Substitution(new Word('país'), new Word('países'));
         yield new Substitution(new Word('pai'), new Word('pais'));
@@ -94,5 +95,6 @@ public static function getIrregular(): iterable
         yield new Substitution(new Word('sacristão'), new Word('sacristães'));
         yield new Substitution(new Word('sotão'), new Word('sotãos'));
         yield new Substitution(new Word('tabelião'), new Word('tabeliães'));
+        yield new Substitution(new Word('útil'), new Word('úteis'));
     }
 }
diff --git a/src/Rules/Portuguese/Uninflected.php b/src/Rules/Portuguese/Uninflected.php
@@ -23,10 +23,24 @@ public static function getPlural(): iterable
     /** @return Pattern[] */
     private static function getDefault(): iterable
     {
-        yield new Pattern('tórax');
-        yield new Pattern('tênis');
-        yield new Pattern('ônibus');
-        yield new Pattern('lápis');
+        yield new Pattern('atlas');
+        yield new Pattern('bate-papo');
+        yield new Pattern('cais');
         yield new Pattern('fênix');
+        yield new Pattern('guarda-chuva');
+        yield new Pattern('guarda-roupa');
+        yield new Pattern('lápis');
+        yield new Pattern('oásis');
+        yield new Pattern('ônibus');
+        yield new Pattern('ônus');
+        yield new Pattern('pára-brisa');
+        yield new Pattern('pára-choque');
+        yield new Pattern('pires');
+        yield new Pattern('porta-malas');
+        yield new Pattern('porta-voz');
+        yield new Pattern('sem-terra');
+        yield new Pattern('tênis');
+        yield new Pattern('tórax');
+        yield new Pattern('vírus');
     }
 }
diff --git a/src/Rules/Swedish/Inflectible.php b/src/Rules/Swedish/Inflectible.php
@@ -0,0 +1,121 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Inflector\Rules\Swedish;
+
+use Doctrine\Inflector\Rules\Pattern;
+use Doctrine\Inflector\Rules\Substitution;
+use Doctrine\Inflector\Rules\Transformation;
+use Doctrine\Inflector\Rules\Word;
+
+class Inflectible
+{
+    /** @return Transformation[] */
+    public static function getSingular(): iterable
+    {
+        yield new Transformation(new Pattern('/eringar$/i'), 'ering');
+        yield new Transformation(new Pattern('/ioner$/i'), 'ion');
+        yield new Transformation(new Pattern('/eer$/i'), 'eum');
+        yield new Transformation(new Pattern('/örer$/i'), 'ör');
+        yield new Transformation(new Pattern('/ärer$/i'), 'är');
+        yield new Transformation(new Pattern('/erier$/i'), 'erie');
+        yield new Transformation(new Pattern('/dier$/i'), 'die');
+        yield new Transformation(new Pattern('/orer$/i'), 'or');
+        yield new Transformation(new Pattern('/ier$/i'), 'i');
+        yield new Transformation(new Pattern('/jer$/i'), 'j');
+        yield new Transformation(new Pattern('/nar$/i'), 'en');
+        yield new Transformation(new Pattern('/kar$/i'), 'ke');
+        yield new Transformation(new Pattern('/kor$/i'), 'ka');
+        yield new Transformation(new Pattern('/mar$/i'), 'me');
+        yield new Transformation(new Pattern('/nar$/i'), 'n');
+        yield new Transformation(new Pattern('/nor$/i'), 'na');
+        yield new Transformation(new Pattern('/rar$/i'), 'er');
+        yield new Transformation(new Pattern('/sor$/i'), 'sa');
+        yield new Transformation(new Pattern('/tor$/i'), 'ta');
+        yield new Transformation(new Pattern('/der$/i'), 'd');
+        yield new Transformation(new Pattern('/ter$/i'), 't');
+        yield new Transformation(new Pattern('/or$/i'), 'a');
+        yield new Transformation(new Pattern('/ar$/i'), '');
+        yield new Transformation(new Pattern('/er$/i'), '');
+    }
+
+    /** @return Transformation[] */
+    public static function getPlural(): iterable
+    {
+        yield new Transformation(new Pattern('/ering$/i'), 'eringar');
+        yield new Transformation(new Pattern('/ion$/i'), 'ioner');
+        yield new Transformation(new Pattern('/ör$/i'), 'örer');
+        yield new Transformation(new Pattern('/är$/i'), 'ärer');
+        yield new Transformation(new Pattern('/or$/i'), 'orer');
+        yield new Transformation(new Pattern('/i$/i'), 'ier');
+        yield new Transformation(new Pattern('/j$/i'), 'jer');
+        yield new Transformation(new Pattern('/um$/i'), 'er');
+        yield new Transformation(new Pattern('/en$/i'), 'nar');
+        yield new Transformation(new Pattern('/er$/i'), 'rar');
+        yield new Transformation(new Pattern('/ie$/i'), 'ier');
+        yield new Transformation(new Pattern('/ka$/i'), 'kor');
+        yield new Transformation(new Pattern('/na$/i'), 'nor');
+        yield new Transformation(new Pattern('/sa$/i'), 'sor');
+        yield new Transformation(new Pattern('/ta$/i'), 'tor');
+        yield new Transformation(new Pattern('/a$/i'), 'or');
+        yield new Transformation(new Pattern('/t$/i'), 'ter');
+        yield new Transformation(new Pattern('/d$/i'), 'der');
+        yield new Transformation(new Pattern('/e$/i'), 'ar');
+        yield new Transformation(new Pattern('/([bfghjklmnpqrstvwxyz])$/i'), '\1ar');
+        yield new Transformation(new Pattern('/$/'), 'er');
+    }
+
+    /** @return Substitution[] */
+    public static function getIrregular(): iterable
+    {
+        yield new Substitution(new Word('and'), new Word('änder'));
+        yield new Substitution(new Word('bok'), new Word('böcker'));
+        yield new Substitution(new Word('bonde'), new Word('bönder'));
+        yield new Substitution(new Word('brand'), new Word('bränder'));
+        yield new Substitution(new Word('bror'), new Word('bröder'));
+        yield new Substitution(new Word('cykel'), new Word('cyklar'));
+        yield new Substitution(new Word('dotter'), new Word('döttrar'));
+        yield new Substitution(new Word('dräkt'), new Word('dräkter'));
+        yield new Substitution(new Word('fader'), new Word('fäder'));
+        yield new Substitution(new Word('far'), new Word('fäder'));
+        yield new Substitution(new Word('fjäder'), new Word('fjädrar'));
+        yield new Substitution(new Word('fot'), new Word('fötter'));
+        yield new Substitution(new Word('get'), new Word('getter'));
+        yield new Substitution(new Word('gås'), new Word('gäss'));
+        yield new Substitution(new Word('hand'), new Word('händer'));
+        yield new Substitution(new Word('huvud'), new Word('huvuden'));
+        yield new Substitution(new Word('ko'), new Word('kor'));
+        yield new Substitution(new Word('land'), new Word('länder'));
+        yield new Substitution(new Word('ledamot'), new Word('ledamöter'));
+        yield new Substitution(new Word('lem'), new Word('lemmar'));
+        yield new Substitution(new Word('lus'), new Word('löss'));
+        yield new Substitution(new Word('man'), new Word('män'));
+        yield new Substitution(new Word('moder'), new Word('mödrar'));
+        yield new Substitution(new Word('mor'), new Word('mödrar'));
+        yield new Substitution(new Word('mus'), new Word('möss'));
+        yield new Substitution(new Word('månad'), new Word('månader'));
+        yield new Substitution(new Word('natt'), new Word('nätter'));
+        yield new Substitution(new Word('rand'), new Word('ränder'));
+        yield new Substitution(new Word('rot'), new Word('rötter'));
+        yield new Substitution(new Word('skrift'), new Word('skrifter'));
+        yield new Substitution(new Word('son'), new Word('söner'));
+        yield new Substitution(new Word('stad'), new Word('städer'));
+        yield new Substitution(new Word('strand'), new Word('stränder'));
+        yield new Substitution(new Word('syster'), new Word('systrar'));
+        yield new Substitution(new Word('tand'), new Word('tänder'));
+        yield new Substitution(new Word('trad'), new Word('trådar'));
+        yield new Substitution(new Word('trakt'), new Word('trakter'));
+        yield new Substitution(new Word('tå'), new Word('tår'));
+        yield new Substitution(new Word('vinter'), new Word('vintrar'));
+        yield new Substitution(new Word('vy'), new Word('vyer'));
+        yield new Substitution(new Word('vän'), new Word('vänner'));
+        yield new Substitution(new Word('äpple'), new Word('äpplen'));
+        yield new Substitution(new Word('ö'), new Word('öar'));
+        yield new Substitution(new Word('öde'), new Word('öden'));
+        yield new Substitution(new Word('öga'), new Word('ögon'));
+        yield new Substitution(new Word('ört'), new Word('örter'));
+        yield new Substitution(new Word('öra'), new Word('öron'));
+        yield new Substitution(new Word('öre'), new Word('ören'));
+    }
+}
diff --git a/src/Rules/Swedish/InflectorFactory.php b/src/Rules/Swedish/InflectorFactory.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Inflector\Rules\Swedish;
+
+use Doctrine\Inflector\GenericLanguageInflectorFactory;
+use Doctrine\Inflector\Rules\Ruleset;
+
+final class InflectorFactory extends GenericLanguageInflectorFactory
+{
+    protected function getSingularRuleset(): Ruleset
+    {
+        return Rules::getSingularRuleset();
+    }
+
+    protected function getPluralRuleset(): Ruleset
+    {
+        return Rules::getPluralRuleset();
+    }
+}
diff --git a/src/Rules/Swedish/Rules.php b/src/Rules/Swedish/Rules.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Inflector\Rules\Swedish;
+
+use Doctrine\Inflector\Rules\Patterns;
+use Doctrine\Inflector\Rules\Ruleset;
+use Doctrine\Inflector\Rules\Substitutions;
+use Doctrine\Inflector\Rules\Transformations;
+
+final class Rules
+{
+    public static function getSingularRuleset(): Ruleset
+    {
+        return new Ruleset(
+            new Transformations(...Inflectible::getSingular()),
+            new Patterns(...Uninflected::getSingular()),
+            (new Substitutions(...Inflectible::getIrregular()))->getFlippedSubstitutions(),
+        );
+    }
+
+    public static function getPluralRuleset(): Ruleset
+    {
+        return new Ruleset(
+            new Transformations(...Inflectible::getPlural()),
+            new Patterns(...Uninflected::getPlural()),
+            new Substitutions(...Inflectible::getIrregular()),
+        );
+    }
+}
diff --git a/src/Rules/Swedish/Uninflected.php b/src/Rules/Swedish/Uninflected.php
diff --git a/tests/Rules/Portuguese/PortugueseFunctionalTest.php b/tests/Rules/Portuguese/PortugueseFunctionalTest.php
diff --git a/tests/Rules/RulesetTest.php b/tests/Rules/RulesetTest.php
diff --git a/tests/Rules/Swedish/SwedishFunctionalTest.php b/tests/Rules/Swedish/SwedishFunctionalTest.php
diff --git a/tests/RulesetInflectorTest.php b/tests/RulesetInflectorTest.php
