From a99948fac62f05e3d7107b1b2a26f43901c27ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sun, 7 Sep 2025 15:34:54 +0200 Subject: [PATCH] Enhancement: Add support for PHP 8.5 --- .github/settings.yml | 10 ++++++++ .github/workflows/integrate.yaml | 42 +++++++++++++++++++++++++++++++- CHANGELOG.md | 5 ++++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/.github/settings.yml b/.github/settings.yml index 44f8cc4d..d9ed0f71 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -55,6 +55,8 @@ branches: - context: "Tests (8.5.19, 8.3, lowest)" - context: "Tests (8.5.40, 8.4, highest)" - context: "Tests (8.5.40, 8.4, lowest)" + - context: "Tests (8.5.40, 8.5, highest)" + - context: "Tests (8.5.40, 8.5, lowest)" - context: "Tests (9.0.0, 7.3, highest)" - context: "Tests (9.0.0, 7.3, lowest)" - context: "Tests (9.0.0, 7.4, highest)" @@ -69,6 +71,8 @@ branches: - context: "Tests (9.0.0, 8.3, lowest)" - context: "Tests (9.6.21, 8.4, highest)" - context: "Tests (9.6.21, 8.4, lowest)" + - context: "Tests (9.6.21, 8.5, highest)" + - context: "Tests (9.6.21, 8.5, lowest)" - context: "Tests (10.0.0, 8.1, highest)" - context: "Tests (10.0.0, 8.1, lowest)" - context: "Tests (10.0.0, 8.2, highest)" @@ -77,16 +81,22 @@ branches: - context: "Tests (10.0.0, 8.3, lowest)" - context: "Tests (10.5.35, 8.4, highest)" - context: "Tests (10.5.35, 8.4, lowest)" + - context: "Tests (10.5.35, 8.5, highest)" + - context: "Tests (10.5.35, 8.5, lowest)" - context: "Tests (11.0.0, 8.2, lowest)" - context: "Tests (11.0.0, 8.2, highest)" - context: "Tests (11.0.0, 8.3, highest)" - context: "Tests (11.0.0, 8.3, lowest)" - context: "Tests (11.3.6, 8.4, highest)" - context: "Tests (11.3.6, 8.4, lowest)" + - context: "Tests (11.3.6, 8.5, highest)" + - context: "Tests (11.3.6, 8.5, lowest)" - context: "Tests (12.0.0, 8.3, highest)" - context: "Tests (12.0.0, 8.3, lowest)" - context: "Tests (12.0.0, 8.4, highest)" - context: "Tests (12.0.0, 8.4, lowest)" + - context: "Tests (12.0.0, 8.5, highest)" + - context: "Tests (12.0.0, 8.5, lowest)" strict: false restrictions: diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 3d46e402..8773fd1e 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -567,6 +567,14 @@ jobs: php-version: "8.4" dependencies: "highest" + - phpunit-version: "8.5.40" + php-version: "8.5" + dependencies: "lowest" + + - phpunit-version: "8.5.40" + php-version: "8.5" + dependencies: "highest" + - phpunit-version: "9.0.0" php-version: "7.3" dependencies: "lowest" @@ -623,6 +631,14 @@ jobs: php-version: "8.4" dependencies: "highest" + - phpunit-version: "9.6.21" + php-version: "8.5" + dependencies: "lowest" + + - phpunit-version: "9.6.21" + php-version: "8.5" + dependencies: "highest" + - phpunit-version: "10.0.0" php-version: "8.1" dependencies: "lowest" @@ -655,6 +671,14 @@ jobs: php-version: "8.4" dependencies: "highest" + - phpunit-version: "10.5.35" + php-version: "8.5" + dependencies: "lowest" + + - phpunit-version: "10.5.35" + php-version: "8.5" + dependencies: "highest" + - phpunit-version: "11.0.0" php-version: "8.2" dependencies: "lowest" @@ -679,6 +703,14 @@ jobs: php-version: "8.4" dependencies: "highest" + - phpunit-version: "11.3.6" + php-version: "8.5" + dependencies: "lowest" + + - phpunit-version: "11.3.6" + php-version: "8.5" + dependencies: "highest" + - phpunit-version: "12.0.0" php-version: "8.3" dependencies: "lowest" @@ -695,6 +727,14 @@ jobs: php-version: "8.4" dependencies: "highest" + - phpunit-version: "12.0.0" + php-version: "8.5" + dependencies: "lowest" + + - phpunit-version: "12.0.0" + php-version: "8.5" + dependencies: "highest" + env: PHPUNIT_SLOW_TEST_DETECTOR_PHAR: ".build/phar/phpunit-slow-test-detector.phar" @@ -754,7 +794,7 @@ jobs: run: "vendor/bin/phpunit --colors=always --configuration=test/Unit/phpunit.xml" - name: "Apply patch from https://github.com/sebastianbergmann/phpunit/pull/4486 for phpunit/phpunit:9.0.0" - if: "(matrix.php-version == '8.3' || matrix.php-version == '8.4') && matrix.phpunit-version == '9.0.0' && matrix.dependencies == 'lowest'" + if: "(matrix.php-version == '8.3' || matrix.php-version == '8.4' || matrix.php-version == '8.5' ) && matrix.phpunit-version == '9.0.0' && matrix.dependencies == 'lowest'" run: | cd vendor/phpunit/phpunit wget -O gh-4486.patch https://github.com/sebastianbergmann/phpunit/commit/0a488f22925b3c8732338ef0fbfe7f13cb4cf1d2.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index 83d5f101..975e9d54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), For a full diff see [`2.20.0...main`][2.20.0...main]. +### Added + +- Added support for PHP 8.5 ([#713]), by [@localheinz] + ## [`2.20.0`][2.20.0] For a full diff see [`2.19.1...2.20.0`][2.19.1...2.20.0]. @@ -423,6 +427,7 @@ For a full diff see [`7afa59c...1.0.0`][7afa59c...1.0.0]. [#651]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/651 [#664]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/664 [#704]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/704 +[#713]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/713 [@dantleech]: https://github.com/dantleech [@HypeMC]: https://github.com/HypeMC