Skip to content

Commit a9a4aa5

Browse files
committed
Update test environment to fix tests on legacy PHP 7.2 with PHPUnit 8.5
1 parent 3902f50 commit a9a4aa5

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
php:
14+
- 8.5
1415
- 8.4
1516
- 8.3
1617
- 8.2
@@ -25,17 +26,14 @@ jobs:
2526
- 5.5
2627
- 5.4
2728
steps:
28-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v6
2930
- uses: shivammathur/setup-php@v2
3031
with:
3132
php-version: ${{ matrix.php }}
3233
coverage: xdebug
3334
ini-file: development
3435
- run: composer install
35-
- run: vendor/bin/phpunit --coverage-text --coverage-clover=clover.xml
36-
if: ${{ matrix.php >= 7.3 }}
37-
- run: vendor/bin/phpunit --coverage-text --coverage-clover=clover.xml -c phpunit.xml.legacy
38-
if: ${{ matrix.php < 7.3 }}
36+
- run: vendor/bin/phpunit --coverage-text --coverage-clover=clover.xml ${{ matrix.php < 7.3 && '-c phpunit.xml.legacy' || '' }}
3937
- name: Check 100% code coverage
4038
shell: php {0}
4139
run: |

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
"require": {
1414
"php": ">=5.4",
1515
"evenement/evenement": "^3.0 || ^2.0",
16-
"react/event-loop": "^1.2",
16+
"react/event-loop": "^1.6",
1717
"react/http": "^1.11",
18-
"react/promise": "^3.2 || ^2.10 || ^1.2.1"
18+
"react/promise": "^3.3 || ^2.10 || ^1.2.1"
1919
},
2020
"require-dev": {
21-
"phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
21+
"phpunit/phpunit": "^9.6 || ^8.5 || ^5.7 || ^4.8.36"
2222
},
2323
"autoload": {
2424
"psr-4": {

0 commit comments

Comments
 (0)