Merge release 2.0.5 into 2.1.x

.gitattributes

@@ -3,3 +3,5 @@
 phpunit.xml.dist export-ignore
 phpcs.xml.dist export-ignore
 composer.lock export-ignore
+phpstan.neon.dist export-ignore
+psalm.xml export-ignore

.github/workflows/coding-standards.yml

@@ -12,4 +12,6 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/[email protected]"
+    uses: "doctrine/.github/.github/workflows/[email protected]"
+    with:
+      php-version: '8.1'

.github/workflows/continuous-integration.yml

@@ -22,4 +22,6 @@ jobs:
 
   phpunit:
     name: "PHPUnit"
-    uses: "doctrine/.github/.github/workflows/[email protected]"
+    uses: "doctrine/.github/.github/workflows/[email protected]"
+    with:
+      php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1"]'

.github/workflows/release-on-milestone-closed.yml

@@ -8,9 +8,8 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@1.1.1"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@1.5.1"
     secrets:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
       ORGANIZATION_ADMIN_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}

.github/workflows/static-analysis.yml

@@ -12,4 +12,6 @@ on:
 jobs:
   static-analysis-phpstan:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/[email protected]"
+    uses: "doctrine/.github/.github/workflows/[email protected]"
+    with:
+      php-version: "8.1"

composer.json

@@ -16,12 +16,12 @@
         "php": "^7.2 || ^8.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^8.2",
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-phpunit": "^0.12",
-        "phpstan/phpstan-strict-rules": "^0.12",
-        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
-        "vimeo/psalm": "^4.10"
+        "doctrine/coding-standard": "^9",
+        "phpstan/phpstan": "^1.8",
+        "phpstan/phpstan-phpunit": "^1.1",
+        "phpstan/phpstan-strict-rules": "^1.3",
+        "phpunit/phpunit": "^8.5 || ^9.5",
+        "vimeo/psalm": "^4.25"
     },
     "autoload": {
         "psr-4": {
@@ -32,5 +32,10 @@
         "psr-4": {
             "Doctrine\\Tests\\Inflector\\": "tests/Doctrine/Tests/Inflector"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }

lib/Doctrine/Inflector/Rules/English/Inflectible.php

@@ -56,6 +56,8 @@ public static function getSingular(): iterable
         yield new Transformation(new Pattern('(f)eet$'), '\1oot');
         yield new Transformation(new Pattern('(n)ews$'), '\1\2ews');
         yield new Transformation(new Pattern('eaus$'), 'eau');
+        yield new Transformation(new Pattern('^tights$'), 'tights');
+        yield new Transformation(new Pattern('^shorts$'), 'shorts');
         yield new Transformation(new Pattern('s$'), '');
     }
 
@@ -99,6 +101,7 @@ public static function getIrregular(): iterable
         yield new Substitution(new Word('atlas'), new Word('atlases'));
         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'));
         yield new Substitution(new Word('brother'), new Word('brothers'));
         yield new Substitution(new Word('cafe'), new Word('cafes'));
         yield new Substitution(new Word('chateau'), new Word('chateaux'));

lib/Doctrine/Inflector/Rules/English/Uninflected.php

@@ -64,6 +64,7 @@ private static function getDefault(): iterable
         yield new Pattern('butter');
         yield new Pattern('cantus');
         yield new Pattern('carp');
+        yield new Pattern('cattle');
         yield new Pattern('chassis');
         yield new Pattern('clippers');
         yield new Pattern('clothing');
@@ -111,6 +112,7 @@ private static function getDefault(): iterable
         yield new Pattern('jackanapes');
         yield new Pattern('jeans');
         yield new Pattern('jedi');
+        yield new Pattern('kin');
         yield new Pattern('kiplingese');
         yield new Pattern('knowledge');
         yield new Pattern('kongoese');

phpcs.xml.dist

@@ -9,6 +9,8 @@
     <!-- Ignore warnings, show progress of the run and show sniff names -->
     <arg value="nps"/>
 
+    <config name="php_version" value="70200"/>
+
     <file>lib</file>
     <file>tests</file>
 

phpstan.neon.dist

@@ -9,5 +9,5 @@ parameters:
       - lib
       - tests
 
-    excludes_analyse:
+    excludePaths:
         - %rootDir%/../../../tests/Doctrine/Tests/Common/*

tests/Doctrine/Tests/Inflector/InflectorFactoryTest.php

@@ -26,6 +26,7 @@ public function testCreateUsesEnglishByDefault(): void
 
     /**
      * @phpstan-param class-string<LanguageInflectorFactory> $expectedClass
+     *
      * @dataProvider provideLanguages
      */
     public function testCreateForLanguageWithCustomLanguage(string $expectedClass, string $language): void

tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php

@@ -47,6 +47,7 @@ public function dataSampleWords(): array
             ['baggage', 'baggage'],
             ['basis', 'bases'],
             ['bison', 'bison'],
+            ['blouse', 'blouses'],
             ['borghese', 'borghese'],
             ['box', 'boxes'],
             ['bream', 'bream'],
@@ -66,6 +67,7 @@ public function dataSampleWords(): array
             ['cantus', 'cantus'],
             ['canvas', 'canvases'],
             ['carp', 'carp'],
+            ['cattle', 'cattle'],
             ['case', 'cases'],
             ['categoria', 'categorias'],
             ['category', 'categories'],
@@ -202,6 +204,7 @@ public function dataSampleWords(): array
             ['jeans', 'jeans'],
             ['jeans', 'jeans'],
             ['jedi', 'jedi'],
+            ['kin', 'kin'],
             ['kiplingese', 'kiplingese'],
             ['kitchenware', 'kitchenware'],
             ['kiss', 'kisses'],
@@ -350,6 +353,7 @@ public function dataSampleWords(): array
             ['shelf', 'shelves'],
             ['shoe', 'shoes'],
             ['shoe', 'shoes'],
+            ['shorts', 'shorts'],
             ['siemens', 'siemens'],
             ['silk', 'silk'],
             ['sku', 'skus'],
@@ -391,6 +395,7 @@ public function dataSampleWords(): array
             ['testis', 'testes'],
             ['thesis', 'theses'],
             ['Thief', 'Thieves'],
+            ['tights', 'tights'],
             ['tomato', 'tomatoes'],
             ['tomato', 'tomatoes'],
             ['tooth', 'teeth'],