Skip to content

Commit 2a1c0ef

Browse files
authored
Merge pull request #636 from ergebnis/feature/php84
Enhancement: Add support for PHP 8.4
2 parents 9a8f8fe + 9a328cd commit 2a1c0ef

File tree

3 files changed

+47
-2
lines changed

3 files changed

+47
-2
lines changed

.github/settings.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ branches:
5353
- context: "Tests (8.5.19, 8.2, lowest)"
5454
- context: "Tests (8.5.19, 8.3, highest)"
5555
- context: "Tests (8.5.19, 8.3, lowest)"
56+
- context: "Tests (8.5.40, 8.4, highest)"
57+
- context: "Tests (8.5.40, 8.4, lowest)"
5658
- context: "Tests (9.0.0, 7.3, highest)"
5759
- context: "Tests (9.0.0, 7.3, lowest)"
5860
- context: "Tests (9.0.0, 7.4, highest)"
@@ -65,16 +67,22 @@ branches:
6567
- context: "Tests (9.0.0, 8.2, lowest)"
6668
- context: "Tests (9.0.0, 8.3, highest)"
6769
- context: "Tests (9.0.0, 8.3, lowest)"
70+
- context: "Tests (9.6.21, 8.4, highest)"
71+
- context: "Tests (9.6.21, 8.4, lowest)"
6872
- context: "Tests (10.0.0, 8.1, highest)"
6973
- context: "Tests (10.0.0, 8.1, lowest)"
7074
- context: "Tests (10.0.0, 8.2, highest)"
7175
- context: "Tests (10.0.0, 8.2, lowest)"
7276
- context: "Tests (10.0.0, 8.3, highest)"
7377
- context: "Tests (10.0.0, 8.3, lowest)"
78+
- context: "Tests (10.5.35, 8.4, highest)"
79+
- context: "Tests (10.5.35, 8.4, lowest)"
7480
- context: "Tests (11.0.0, 8.2, lowest)"
7581
- context: "Tests (11.0.0, 8.2, highest)"
7682
- context: "Tests (11.0.0, 8.3, highest)"
7783
- context: "Tests (11.0.0, 8.3, lowest)"
84+
- context: "Tests (11.3.6, 8.4, highest)"
85+
- context: "Tests (11.3.6, 8.4, lowest)"
7886
strict: false
7987
restrictions:
8088

.github/workflows/integrate.yaml

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -555,10 +555,18 @@ jobs:
555555
php-version: "8.3"
556556
dependencies: "lowest"
557557

558-
- phpunit-version: "8.5.19"
558+
- phpunit-version: "8.5.40"
559559
php-version: "8.3"
560560
dependencies: "highest"
561561

562+
- phpunit-version: "8.5.40"
563+
php-version: "8.4"
564+
dependencies: "lowest"
565+
566+
- phpunit-version: "8.5.19"
567+
php-version: "8.4"
568+
dependencies: "highest"
569+
562570
- phpunit-version: "9.0.0"
563571
php-version: "7.3"
564572
dependencies: "lowest"
@@ -607,6 +615,14 @@ jobs:
607615
php-version: "8.3"
608616
dependencies: "highest"
609617

618+
- phpunit-version: "9.6.21"
619+
php-version: "8.4"
620+
dependencies: "lowest"
621+
622+
- phpunit-version: "9.6.21"
623+
php-version: "8.4"
624+
dependencies: "highest"
625+
610626
- phpunit-version: "10.0.0"
611627
php-version: "8.1"
612628
dependencies: "lowest"
@@ -631,6 +647,14 @@ jobs:
631647
php-version: "8.3"
632648
dependencies: "highest"
633649

650+
- phpunit-version: "10.5.35"
651+
php-version: "8.4"
652+
dependencies: "lowest"
653+
654+
- phpunit-version: "10.5.35"
655+
php-version: "8.4"
656+
dependencies: "highest"
657+
634658
- phpunit-version: "11.0.0"
635659
php-version: "8.2"
636660
dependencies: "lowest"
@@ -647,6 +671,14 @@ jobs:
647671
php-version: "8.3"
648672
dependencies: "highest"
649673

674+
- phpunit-version: "11.3.6"
675+
php-version: "8.4"
676+
dependencies: "lowest"
677+
678+
- phpunit-version: "11.3.6"
679+
php-version: "8.4"
680+
dependencies: "highest"
681+
650682
env:
651683
PHPUNIT_SLOW_TEST_DETECTOR_PHAR: ".build/phar/phpunit-slow-test-detector.phar"
652684

@@ -706,7 +738,7 @@ jobs:
706738
run: "vendor/bin/phpunit --colors=always --configuration=test/Unit/phpunit.xml"
707739

708740
- name: "Apply patch from https://github.com/sebastianbergmann/phpunit/pull/4486 for phpunit/phpunit:9.0.0"
709-
if: "matrix.php-version == '8.3' && matrix.phpunit-version == '9.0.0' && matrix.dependencies == 'lowest'"
741+
if: "(matrix.php-version == '8.3' || matrix.php-version == '8.4') && matrix.phpunit-version == '9.0.0' && matrix.dependencies == 'lowest'"
710742
run: |
711743
cd vendor/phpunit/phpunit
712744
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.16.1...main`][2.16.1...main].
1010

11+
### Added
12+
13+
- Added support for PHP 8.4 ([#635]), by [@localheinz]
14+
1115
## [`2.16.1`][2.16.1]
1216

1317
For a full diff see [`2.16.0...2.16.1`][2.16.0...2.16.1].
@@ -369,6 +373,7 @@ For a full diff see [`7afa59c...1.0.0`][7afa59c...1.0.0].
369373
[#559]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/559
370374
[#598]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/598
371375
[#604]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/604
376+
[#635]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/635
372377

373378
[@dantleech]: https://github.com/dantleech
374379
[@HypeMC]: https://github.com/HypeMC

0 commit comments

Comments
 (0)