PHP 8.5 support (#102)

vjik · web-flow · commit c4b1f8f40fcf · 2025-11-30T11:03:00.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.0', '8.1', '8.2', '8.3', '8.4']
+        ['8.0', '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.0', '8.1', '8.2', '8.3', '8.4']
+        ['8.0', '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.5']
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -30,12 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3', '8.4']
-  psalm80:
-    uses: yiisoft/actions/.github/workflows/psalm.yml@master
-    with:
-      psalm-config: psalm80.xml
-      os: >-
-        ['ubuntu-latest']
-      php: >-
-        ['8.0']
+        ['8.0', '8.1', '8.2', '8.3', '8.4']
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,7 @@
 - Enh #87: Use FQN for built-in PHP functions, minor refactoring `FileHelper` and `PathMatcher` (@Tigrov)
 - Bug #91: Restore error handler after handling exception (@vjik)
 - Enh #99: Suppress warnings that emitted when path not exist on `FileHelper::lastModifiedTime()` usage (@vjik)  
-- Chg #101: Change PHP constraint in `composer.json` to `8.0 - 8.4` (@vjik)
+- Chg #101, #102: Change PHP constraint in `composer.json` to `8.0 - 8.5` (@vjik)
 
 ## 2.0.0 July 05, 2022
 
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ The package provides useful methods to manage files and directories.
 
 ## Requirements
 
-- PHP 8.0 or higher.
+- PHP 8.0 - 8.5.
 
 ## Installation
 
diff --git a/composer.json b/composer.json
@@ -26,17 +26,16 @@
         }
     ],
     "require": {
-        "php": "8.0 - 8.4",
+        "php": "8.0 - 8.5",
         "yiisoft/strings": "^2.0"
     },
     "require-dev": {
         "ext-zlib": "*",
+        "bamarni/composer-bin-plugin": "^1.8.3",
         "maglnet/composer-require-checker": "^4.4",
         "phpunit/phpunit": "^9.6.22",
         "rector/rector": "^2.0.10",
-        "roave/infection-static-analysis-plugin": "^1.25",
-        "spatie/phpunit-watcher": "^1.23.6",
-        "vimeo/psalm": "^4.30 || ^5.26.1 || ^6.8.8"
+        "spatie/phpunit-watcher": "^1.23.6"
     },
     "autoload": {
         "psr-4": {
@@ -48,11 +47,17 @@
             "Yiisoft\\Files\\Tests\\": "tests"
         }
     },
+    "extra": {
+        "bamarni-bin": {
+            "bin-links": true,
+            "target-directory": "tools",
+            "forward-command": true
+        }
+    },
     "config": {
         "sort-packages": true,
-        "bump-after-update": "dev",
         "allow-plugins": {
-            "infection/extension-installer": true,
+            "bamarni/composer-bin-plugin": true,
             "composer/package-versions-deprecated": true
         }
     },
diff --git a/psalm80.xml b/psalm80.xml
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.5']