Skip to content

Commit 47af7d6

Browse files
authored
Merge pull request #122 from clue-labs/phpunit
Improve test suite to add forward compatibility with PHPUnit 7, test against PHP 7.3 and use legacy PHPUnit 5 on legacy HHVM
2 parents 0a0bedf + 488f2be commit 47af7d6

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ php:
88
- 7.0
99
- 7.1
1010
- 7.2
11-
- hhvm # ignore errors, see below
11+
- 7.3
12+
# - hhvm # requires legacy phpunit & ignore errors, see below
1213

1314
# lock distro so new future defaults will not break the build
1415
dist: trusty
@@ -17,6 +18,8 @@ matrix:
1718
include:
1819
- php: 5.3
1920
dist: precise
21+
- php: hhvm
22+
install: composer require phpunit/phpunit:^5 --dev --no-interaction
2023
allow_failures:
2124
- php: hhvm
2225

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"require-dev": {
1515
"clue/block-react": "^1.2",
16-
"phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"
16+
"phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35"
1717
},
1818
"autoload": {
1919
"psr-4": { "React\\Dns\\": "src" }

phpunit.xml.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
convertWarningsToExceptions="true"
99
processIsolation="false"
1010
stopOnFailure="false"
11-
syntaxCheck="false"
1211
bootstrap="vendor/autoload.php"
1312
>
1413
<testsuites>

0 commit comments

Comments
 (0)