From 0a7c37aa87dbcda049011e7de9a951f89685b3af Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Wed, 17 Dec 2025 14:13:56 +0300 Subject: [PATCH 1/2] PHP 8.5 support --- .github/workflows/build.yml | 2 +- .github/workflows/composer-require-checker.yml | 2 +- CHANGELOG.md | 2 +- README.md | 2 +- composer.json | 16 ++++++++-------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68fac01..3c26d62 100644 --- 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 index 632bfd4..a035b54 100644 --- 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/CHANGELOG.md b/CHANGELOG.md index 99b5109..48226ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 3.0.1 under development -- no changes in this release. +- Enh #71: Add PHP 8.5 support (@vjik) ## 3.0.0 March 04, 2025 diff --git a/README.md b/README.md index c4dfca4..04c37bc 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ and a flash message service which helps use one-time messages. ## Requirements -- PHP 8.0 or higher. +- PHP 8.0 - 8.5. ## Installation diff --git a/composer.json b/composer.json index 4b05d15..35c7d8a 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ } ], "require": { - "php": "8.0 - 8.4", + "php": "8.0 - 8.5", "psr/http-message": "^1.0 || ^2.0", "psr/http-message-implementation": "1.0", "psr/http-server-handler": "^1.0", @@ -37,14 +37,14 @@ "yiisoft/cookies": "^1.0" }, "require-dev": { - "maglnet/composer-require-checker": "^4.4", + "maglnet/composer-require-checker": "^4.19", "nyholm/psr7": "^1.8.2", - "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.6 || ^6.8.8", - "yiisoft/di": "^1.2.1" + "phpunit/phpunit": "^9.6.31", + "rector/rector": "^2.2.14", + "roave/infection-static-analysis-plugin": "^1.42", + "spatie/phpunit-watcher": "^1.24.0", + "vimeo/psalm": "^4.30 || ^5.6 || ^6.14.2", + "yiisoft/di": "^1.4.1" }, "suggest": { "ext-session": "Allows using native PHP sessions" From ffce60f6214980089406269c445010ce2fa31b4f Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Wed, 17 Dec 2025 14:15:26 +0300 Subject: [PATCH 2/2] fix --- composer.json | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 35c7d8a..a1b22fd 100644 --- a/composer.json +++ b/composer.json @@ -37,14 +37,14 @@ "yiisoft/cookies": "^1.0" }, "require-dev": { - "maglnet/composer-require-checker": "^4.19", + "maglnet/composer-require-checker": "^4.4", "nyholm/psr7": "^1.8.2", - "phpunit/phpunit": "^9.6.31", - "rector/rector": "^2.2.14", - "roave/infection-static-analysis-plugin": "^1.42", - "spatie/phpunit-watcher": "^1.24.0", - "vimeo/psalm": "^4.30 || ^5.6 || ^6.14.2", - "yiisoft/di": "^1.4.1" + "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.6 || ^6.8.8", + "yiisoft/di": "^1.2.1" }, "suggest": { "ext-session": "Allows using native PHP sessions" @@ -70,7 +70,6 @@ }, "config": { "sort-packages": true, - "bump-after-update": "dev", "allow-plugins": { "infection/extension-installer": true, "composer/package-versions-deprecated": true