Skip to content

Commit a99948f

Browse files
localheinzlocalheinz
committed
Enhancement: Add support for PHP 8.5
1 parent 36225d3 commit a99948f

File tree

3 files changed

+56
-1
lines changed

3 files changed

+56
-1
lines changed

‎.github/settings.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ branches:
5555
- context: "Tests (8.5.19, 8.3, lowest)"
5656
- context: "Tests (8.5.40, 8.4, highest)"
5757
- context: "Tests (8.5.40, 8.4, lowest)"
58+
- context: "Tests (8.5.40, 8.5, highest)"
59+
- context: "Tests (8.5.40, 8.5, lowest)"
5860
- context: "Tests (9.0.0, 7.3, highest)"
5961
- context: "Tests (9.0.0, 7.3, lowest)"
6062
- context: "Tests (9.0.0, 7.4, highest)"
@@ -69,6 +71,8 @@ branches:
6971
- context: "Tests (9.0.0, 8.3, lowest)"
7072
- context: "Tests (9.6.21, 8.4, highest)"
7173
- context: "Tests (9.6.21, 8.4, lowest)"
74+
- context: "Tests (9.6.21, 8.5, highest)"
75+
- context: "Tests (9.6.21, 8.5, lowest)"
7276
- context: "Tests (10.0.0, 8.1, highest)"
7377
- context: "Tests (10.0.0, 8.1, lowest)"
7478
- context: "Tests (10.0.0, 8.2, highest)"
@@ -77,16 +81,22 @@ branches:
7781
- context: "Tests (10.0.0, 8.3, lowest)"
7882
- context: "Tests (10.5.35, 8.4, highest)"
7983
- context: "Tests (10.5.35, 8.4, lowest)"
84+
- context: "Tests (10.5.35, 8.5, highest)"
85+
- context: "Tests (10.5.35, 8.5, lowest)"
8086
- context: "Tests (11.0.0, 8.2, lowest)"
8187
- context: "Tests (11.0.0, 8.2, highest)"
8288
- context: "Tests (11.0.0, 8.3, highest)"
8389
- context: "Tests (11.0.0, 8.3, lowest)"
8490
- context: "Tests (11.3.6, 8.4, highest)"
8591
- context: "Tests (11.3.6, 8.4, lowest)"
92+
- context: "Tests (11.3.6, 8.5, highest)"
93+
- context: "Tests (11.3.6, 8.5, lowest)"
8694
- context: "Tests (12.0.0, 8.3, highest)"
8795
- context: "Tests (12.0.0, 8.3, lowest)"
8896
- context: "Tests (12.0.0, 8.4, highest)"
8997
- context: "Tests (12.0.0, 8.4, lowest)"
98+
- context: "Tests (12.0.0, 8.5, highest)"
99+
- context: "Tests (12.0.0, 8.5, lowest)"
90100
strict: false
91101
restrictions:
92102

‎.github/workflows/integrate.yaml‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,14 @@ jobs:
567567
php-version: "8.4"
568568
dependencies: "highest"
569569

570+
- phpunit-version: "8.5.40"
571+
php-version: "8.5"
572+
dependencies: "lowest"
573+
574+
- phpunit-version: "8.5.40"
575+
php-version: "8.5"
576+
dependencies: "highest"
577+
570578
- phpunit-version: "9.0.0"
571579
php-version: "7.3"
572580
dependencies: "lowest"
@@ -623,6 +631,14 @@ jobs:
623631
php-version: "8.4"
624632
dependencies: "highest"
625633

634+
- phpunit-version: "9.6.21"
635+
php-version: "8.5"
636+
dependencies: "lowest"
637+
638+
- phpunit-version: "9.6.21"
639+
php-version: "8.5"
640+
dependencies: "highest"
641+
626642
- phpunit-version: "10.0.0"
627643
php-version: "8.1"
628644
dependencies: "lowest"
@@ -655,6 +671,14 @@ jobs:
655671
php-version: "8.4"
656672
dependencies: "highest"
657673

674+
- phpunit-version: "10.5.35"
675+
php-version: "8.5"
676+
dependencies: "lowest"
677+
678+
- phpunit-version: "10.5.35"
679+
php-version: "8.5"
680+
dependencies: "highest"
681+
658682
- phpunit-version: "11.0.0"
659683
php-version: "8.2"
660684
dependencies: "lowest"
@@ -679,6 +703,14 @@ jobs:
679703
php-version: "8.4"
680704
dependencies: "highest"
681705

706+
- phpunit-version: "11.3.6"
707+
php-version: "8.5"
708+
dependencies: "lowest"
709+
710+
- phpunit-version: "11.3.6"
711+
php-version: "8.5"
712+
dependencies: "highest"
713+
682714
- phpunit-version: "12.0.0"
683715
php-version: "8.3"
684716
dependencies: "lowest"
@@ -695,6 +727,14 @@ jobs:
695727
php-version: "8.4"
696728
dependencies: "highest"
697729

730+
- phpunit-version: "12.0.0"
731+
php-version: "8.5"
732+
dependencies: "lowest"
733+
734+
- phpunit-version: "12.0.0"
735+
php-version: "8.5"
736+
dependencies: "highest"
737+
698738
env:
699739
PHPUNIT_SLOW_TEST_DETECTOR_PHAR: ".build/phar/phpunit-slow-test-detector.phar"
700740

@@ -754,7 +794,7 @@ jobs:
754794
run: "vendor/bin/phpunit --colors=always --configuration=test/Unit/phpunit.xml"
755795

756796
- name: "Apply patch from https://github.com/sebastianbergmann/phpunit/pull/4486 for phpunit/phpunit:9.0.0"
757-
if: "(matrix.php-version == '8.3' || matrix.php-version == '8.4') && matrix.phpunit-version == '9.0.0' && matrix.dependencies == 'lowest'"
797+
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'"
758798
run: |
759799
cd vendor/phpunit/phpunit
760800
wget -O gh-4486.patch https://github.com/sebastianbergmann/phpunit/commit/0a488f22925b3c8732338ef0fbfe7f13cb4cf1d2.patch

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
88

99
For a full diff see [`2.20.0...main`][2.20.0...main].
1010

11+
### Added
12+
13+
- Added support for PHP 8.5 ([#713]), by [@localheinz]
14+
1115
## [`2.20.0`][2.20.0]
1216

1317
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].
423427
[#651]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/651
424428
[#664]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/664
425429
[#704]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/704
430+
[#713]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/713
426431

427432
[@dantleech]: https://github.com/dantleech
428433
[@HypeMC]: https://github.com/HypeMC

0 commit comments

Comments
 (0)