PHP 8.5 support (#785)

Author: vjik

.github/workflows/build.yml

@@ -31,7 +31,7 @@ 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']
   phpunit-without-intl:
     uses: yiisoft/actions/.github/workflows/phpunit.yml@master
     with:
@@ -41,4 +41,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']

.github/workflows/composer-require-checker.yml

@@ -31,5 +31,5 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3', '8.4']
+        ['8.1', '8.2', '8.3', '8.4', '8.5']
       config: ./composer-require-checker.json

.github/workflows/mutation.yml

@@ -22,12 +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:
-      min-covered-msi: 100
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.4']
+        ['8.5']
+      infection-args: "--ignore-msi-with-no-mutations"
     secrets:
       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.github/workflows/rector.yml

@@ -21,4 +21,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.4']
+        ['8.5']

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Bug #776: Take `PropertyTranslatorProviderInterface` into account during context validation (@vjik)
 - Bug #783: Fix error on uninitialized properties validation (@batyrmastyr)
+- Enh #784: Add PHP 8.5 support (@vjik)
 
 ## 2.5.0 July 19, 2025
 

README.md

@@ -36,7 +36,7 @@ This package provides data validation capabilities.
 
 ## Requirements
 
-- PHP 8.1 or higher.
+- PHP 8.1 - 8.5.
 - `mbstring` PHP extension.
 
 ## Installation

composer.json

@@ -27,7 +27,7 @@
         }
     ],
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+        "php": "8.1 - 8.5",
         "ext-mbstring": "*",
         "psr/container": "^1.0 || ^2.0",
         "psr/http-message": "^1.0 || ^2.0",
@@ -38,14 +38,13 @@
         "yiisoft/translator": "^2.1 || ^3.0"
     },
     "require-dev": {
+        "bamarni/composer-bin-plugin": "^1.8.3",
         "jetbrains/phpstorm-attributes": "^1.2",
         "maglnet/composer-require-checker": "^4.7.1",
         "phpbench/phpbench": "^1.4.1",
         "phpunit/phpunit": "^10.5.46",
         "rector/rector": "^2.0.16",
-        "roave/infection-static-analysis-plugin": "^1.35",
         "spatie/phpunit-watcher": "^1.24",
-        "vimeo/psalm": "^5.26.1 || ^6.12",
         "yiisoft/di": "^1.3",
         "yiisoft/test-support": "^3.0.2",
         "yiisoft/translator-message-php": "^1.1.1",
@@ -67,6 +66,11 @@
         }
     },
     "extra": {
+        "bamarni-bin": {
+            "bin-links": true,
+            "target-directory": "tools",
+            "forward-command": true
+        },
         "config-plugin-options": {
             "source-directory": "config"
         },
@@ -78,7 +82,7 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "infection/extension-installer": true,
+            "bamarni/composer-bin-plugin": true,
             "composer/package-versions-deprecated": true,
             "yiisoft/config": false
         }

tests/Rule/Image/ImageTest.php

@@ -139,14 +139,14 @@ public static function dataValidationFailed(): array
         $notImageResult = ['' => ['Value must be an image.']];
 
         return [
-            'heic-with-width' => [__DIR__ . '/797x808.HEIC', new Image(width: 10), $notImageResult],
-            'heic-with-height' => [__DIR__ . '/797x808.HEIC', new Image(height: 10), $notImageResult],
-            'heic-with-min-width' => [__DIR__ . '/797x808.HEIC', new Image(minWidth: 10), $notImageResult],
-            'heic-with-max-height' => [__DIR__ . '/797x808.HEIC', new Image(minHeight: 10), $notImageResult],
-            'heic-with-max-width' => [__DIR__ . '/797x808.HEIC', new Image(maxWidth: 10), $notImageResult],
-            'heic-with-min-height' => [__DIR__ . '/797x808.HEIC', new Image(maxHeight: 10), $notImageResult],
+            'heic-with-width' => [__DIR__ . '/not-image.jpg', new Image(width: 10), $notImageResult],
+            'heic-with-height' => [__DIR__ . '/not-image.jpg', new Image(height: 10), $notImageResult],
+            'heic-with-min-width' => [__DIR__ . '/not-image.jpg', new Image(minWidth: 10), $notImageResult],
+            'heic-with-max-height' => [__DIR__ . '/not-image.jpg', new Image(minHeight: 10), $notImageResult],
+            'heic-with-max-width' => [__DIR__ . '/not-image.jpg', new Image(maxWidth: 10), $notImageResult],
+            'heic-with-min-height' => [__DIR__ . '/not-image.jpg', new Image(maxHeight: 10), $notImageResult],
             'heic-with-size-and-custom-message' => [
-                ['a' => __DIR__ . '/797x808.HEIC'],
+                ['a' => __DIR__ . '/not-image.jpg'],
                 ['a' => new Image(minWidth: 10, notImageMessage: 'Value of "{property}" must be an image.')],
                 ['a' => ['Value of "a" must be an image.']],
             ],

tests/Rule/Image/not-image.jpg

@@ -0,0 +1,2 @@
+/*/vendor
+/*/composer.lock