Skip to content

Commit 4d3ca78

Browse files
authored
Merge pull request #43 from clue-labs/phpunit8
Update test environment to fix tests on legacy PHP 7.2 with PHPUnit 8.5
2 parents c9f250b + 0075020 commit 4d3ca78

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- 8.0
1717
- 7.4
1818
- 7.3
19-
# - 7.2 # skip temporarily due to version conflicts
19+
- 7.2
2020
- 7.1
2121
- 7.0
2222
- 5.6
@@ -32,10 +32,7 @@ jobs:
3232
- run: composer remove react/mysql --dev --no-interaction # do not install react/mysql example on legacy PHP
3333
if: ${{ matrix.php == 5.3 }}
3434
- run: composer install
35-
- run: vendor/bin/phpunit --coverage-text
36-
if: ${{ matrix.php >= 7.3 }}
37-
- run: vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy
38-
if: ${{ matrix.php < 7.3 }}
35+
- run: vendor/bin/phpunit --coverage-text ${{ matrix.php < 7.3 && '-c phpunit.xml.legacy' || '' }}
3936

4037
PHPUnit-hhvm:
4138
name: PHPUnit (HHVM)

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"react/stream": "^1.2"
2121
},
2222
"require-dev": {
23-
"phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
23+
"phpunit/phpunit": "^9.6 || ^8.5 || ^5.7 || ^4.8.36",
2424
"react/async": "^4 || ^3 || ^2",
2525
"react/http": "^1.5",
2626
"react/mysql": "^0.5.5",

0 commit comments

Comments
 (0)