Merge pull request #278 from greg0ire/2.1.x

Merge 2.0.x up into 2.1.x

Author: greg0ire

.gitattributes

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

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "CI"

.github/workflows/coding-standards.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@2.1.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.2.1"

.github/workflows/composer-lint.yml

@@ -0,0 +1,18 @@
+name: "Composer Lint"
+
+on:
+  pull_request:
+    branches:
+      - "*.x"
+    paths:
+      - "composer.json"
+  push:
+    branches:
+      - "*.x"
+    paths:
+      - "composer.json"
+
+jobs:
+  composer-lint:
+    name: "Composer Lint"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@7.2.1"

.github/workflows/continuous-integration.yml

@@ -14,7 +14,7 @@ jobs:
     name: "Roave BC Check"
     runs-on: ubuntu-latest
     steps:
-      - uses: "actions/checkout@v3"
+      - uses: "actions/checkout@v4"
         with:
           fetch-depth: 0
 
@@ -31,6 +31,8 @@ jobs:
 
   phpunit:
     name: "PHPUnit"
-    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@2.1.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@7.2.1"
     with:
       php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]'
+    secrets:
+      CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

.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@2.1.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.2.1"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   static-analysis-phpstan:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@2.1.0"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.2.1"

.github/workflows/website-schema.yml

@@ -0,0 +1,21 @@
+
+name: "Website config validation"
+
+on:
+  pull_request:
+    branches:
+      - "*.x"
+    paths:
+      - ".doctrine-project.json"
+      - ".github/workflows/website-schema.yml"
+  push:
+    branches:
+      - "*.x"
+    paths:
+      - ".doctrine-project.json"
+      - ".github/workflows/website-schema.yml"
+
+jobs:
+  json-validate:
+    name: "Validate JSON schema"
+    uses: "doctrine/.github/.github/workflows/website-schema.yml@7.2.1"

composer.json

@@ -1,17 +1,43 @@
 {
     "name": "doctrine/inflector",
-    "type": "library",
     "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.",
-    "keywords": ["php", "strings", "words", "manipulation", "inflector", "inflection", "uppercase", "lowercase", "singular", "plural"],
-    "homepage": "https://www.doctrine-project.org/projects/inflector.html",
     "license": "MIT",
+    "type": "library",
+    "keywords": [
+        "php",
+        "strings",
+        "words",
+        "manipulation",
+        "inflector",
+        "inflection",
+        "uppercase",
+        "lowercase",
+        "singular",
+        "plural"
+    ],
     "authors": [
-        {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
-        {"name": "Roman Borschel", "email": "roman@code-factory.org"},
-        {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
-        {"name": "Jonathan Wage", "email": "jonwage@gmail.com"},
-        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
+        {
+            "name": "Guilherme Blanco",
+            "email": "guilhermeblanco@gmail.com"
+        },
+        {
+            "name": "Roman Borschel",
+            "email": "roman@code-factory.org"
+        },
+        {
+            "name": "Benjamin Eberlei",
+            "email": "kontakt@beberlei.de"
+        },
+        {
+            "name": "Jonathan Wage",
+            "email": "jonwage@gmail.com"
+        },
+        {
+            "name": "Johannes Schmitt",
+            "email": "schmittjoh@gmail.com"
+        }
     ],
+    "homepage": "https://www.doctrine-project.org/projects/inflector.html",
     "require": {
         "php": "^7.2 || ^8.0"
     },
@@ -20,22 +46,22 @@
         "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 || ^5.4"
+        "phpunit/phpunit": "^8.5 || ^9.5"
     },
     "autoload": {
         "psr-4": {
-            "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
+            "Doctrine\\Inflector\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Doctrine\\Tests\\Inflector\\": "tests/Doctrine/Tests/Inflector"
+            "Doctrine\\Tests\\Inflector\\": "tests"
         }
     },
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
-        }
+        },
+        "sort-packages": true
     }
 }

phpcs.xml.dist

@@ -11,13 +11,10 @@
 
     <config name="php_version" value="70200"/>
 
-    <file>lib</file>
+    <file>src</file>
     <file>tests</file>
 
-    <rule ref="Doctrine">
-        <exclude-pattern>lib/Doctrine/Common</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Tests/Common</exclude-pattern>
-    </rule>
+    <rule ref="Doctrine" />
 
     <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
         <properties>