Skip to content

Commit 611b025

Browse files
authored
Allow Php8.5 Support (#122)
1 parent f3e34cc commit 611b025

3 files changed

Lines changed: 16 additions & 3 deletions

File tree

.github/workflows/build.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
- "8.2"
2222
- "8.3"
2323
- "8.4"
24+
- "8.5"
2425
os:
2526
- ubuntu-latest
2627
- windows-latest
@@ -42,6 +43,12 @@ jobs:
4243
php-version: "8.1"
4344
- phpunit-version: "12"
4445
php-version: "8.2"
46+
47+
# the lowest paratest version that supports PHP 8.5 requires PHPUnit ^12
48+
- phpunit-version: "10"
49+
php-version: "8.5"
50+
- phpunit-version: "11"
51+
php-version: "8.5"
4552
include:
4653
# PHPUnit ^10.5.32 is incompatible with paratest 7.3.
4754
# Paratest 7.4.6, which fixes the incompatibility, requires PHP 8.2
@@ -53,6 +60,12 @@ jobs:
5360
# We constraint PHPUnit 11 to ^11.2 until we find a better solution
5461
- phpunit-version: "11"
5562
update-constraints: "'--with=phpunit/phpunit:^11.2'"
63+
64+
# Some dev libraries are resolved to versions incompatible with PHP 8.5
65+
# under the --prefer-lowest strategy. Here we're constraining them to
66+
# the lowest compatible versions.
67+
- php-version: "8.5"
68+
update-constraints: "'--with=amphp/amp:>=3.1.1' '--with=amphp/parallel:>=2.3.3' '--with=nikic/php-parser:>=5.7' '--with=revolt/event-loop:>=1.0.8'"
5669
steps:
5770
- name: Checkout
5871
uses: actions/checkout@v6

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This adapter only generates JSON files containing information about tests. See [
3535
## Installation && Usage
3636
**Note:** this adapter supports Allure 2.x.x only.
3737

38-
Supported PHP versions: 8.1-8.4.
38+
Supported PHP versions: 8.1-8.5.
3939

4040
In order to use this adapter you need to add a new dependency to your **composer.json** file:
4141
```

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
"source": "https://github.com/allure-framework/allure-phpunit"
3030
},
3131
"require": {
32-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
32+
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
3333
"allure-framework/allure-php-commons": "^2.0",
3434
"phpunit/phpunit": "^10.0.5 || ^11 || ^12.0.1"
3535
},
3636
"require-dev": {
3737
"brianium/paratest": "^7",
3838
"psalm/plugin-phpunit": "^0.19.5",
3939
"squizlabs/php_codesniffer": "^3.7.2",
40-
"vimeo/psalm": "^6.10"
40+
"vimeo/psalm": "^6.14.3"
4141
},
4242
"conflict": {
4343
"amphp/byte-stream": "<1.5.1",

0 commit comments

Comments
 (0)