Add PHP 8.5 support (#287)

vjik · web-flow · commit d75c5712e5a7 · 2025-12-07T09:50:04.000+03:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.1', '8.2', '8.3', '8.4']
+        ['8.1', '8.2', '8.3', '8.4', '8.5']
diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3', '8.4']
+        ['8.1', '8.2', '8.3', '8.4', '8.5']
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -22,11 +22,12 @@ name: mutation test
 
 jobs:
   mutation:
-    uses: yiisoft/actions/.github/workflows/roave-infection.yml@master
+    uses: yiisoft/actions/.github/workflows/infection.yml@master
     with:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.3']
+        ['8.5']
+      infection-args: "--ignore-msi-with-no-mutations"
     secrets:
       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -21,4 +21,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.4']
+        ['8.1']
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 12.2.2 under development
 
-- no changes in this release.
+- Enh #287: Add PHP 8.5 support (@vjik)
 
 ## 12.2.1 July 20, 2025
 
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ PHP-based as default, and more. It's used in [Yii Framework](https://www.yiifram
 
 ## Requirements
 
-- PHP 8.1 or higher.
+- PHP 8.1 - 8.5.
 
 ## Installation
 
diff --git a/composer.json b/composer.json
@@ -27,20 +27,19 @@
         }
     ],
     "require": {
-        "php": "8.1 - 8.4",
+        "php": "8.1 - 8.5",
         "yiisoft/arrays": "^2.0 || ^3.0",
         "yiisoft/cache": "^1.0 || ^2.0 || ^3.0",
         "yiisoft/files": "^1.0 || ^2.0",
         "yiisoft/html": "^2.5 || ^3.0",
         "yiisoft/json": "^1.0"
     },
     "require-dev": {
+        "bamarni/composer-bin-plugin": "^1.8.3",
         "maglnet/composer-require-checker": "^4.7.1",
         "phpunit/phpunit": "^10.5.48",
         "rector/rector": "^2.1.2",
-        "roave/infection-static-analysis-plugin": "^1.35",
         "spatie/phpunit-watcher": "^1.24",
-        "vimeo/psalm": "^5.26.1 || ^6.8.9",
         "yiisoft/aliases": "^3.0",
         "yiisoft/di": "^1.4",
         "yiisoft/psr-dummy-provider": "^1.0.2",
@@ -54,6 +53,11 @@
             "params": "params.php",
             "di": "di.php",
             "di-web": "di-web.php"
+        },
+        "bamarni-bin": {
+            "bin-links": true,
+            "target-directory": "tools",
+            "forward-command": true
         }
     },
     "suggestion": {
@@ -72,7 +76,7 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "infection/extension-installer": true,
+            "bamarni/composer-bin-plugin": true,
             "composer/package-versions-deprecated": true
         }
     },
diff --git a/tools/.gitignore b/tools/.gitignore
@@ -0,0 +1,2 @@
+/*/vendor
+/*/composer.lock
diff --git a/tools/infection/composer.json b/tools/infection/composer.json
@@ -0,0 +1,10 @@
+{
+    "require-dev": {
+        "infection/infection": "^0.26 || ^0.31.9"
+    },
+    "config": {
+        "allow-plugins": {
+            "infection/extension-installer": true
+        }
+    }
+}
diff --git a/tools/psalm/composer.json b/tools/psalm/composer.json
@@ -0,0 +1,5 @@
+{
+    "require-dev": {
+        "vimeo/psalm": "^5.26.1 || ^6.8.9"
+    }
+}

-Original file line number
+Diff line change
       os: >-
         ['ubuntu-latest']
       php: >-
 -        ['8.4']
 +        ['8.1']