Skip to content

Commit 52f330e

Browse files
committed
Run tests on PHP 7.4 and simplify test matrix
Refs reactphp/dns#156 and reactphp/promise-timer#41
1 parent 57ac1c9 commit 52f330e

File tree

3 files changed

+16
-26
lines changed

3 files changed

+16
-26
lines changed

.travis.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
language: php
22

3-
php:
4-
# - 5.3 # requires old distro, see below
5-
- 5.4
6-
- 5.5
7-
- 5.6
8-
- 7.0
9-
- 7.1
10-
- 7.2
11-
- hhvm
12-
133
# lock distro so new future defaults will not break the build
144
dist: trusty
155

166
matrix:
177
include:
188
- php: 5.3
199
dist: precise
10+
- php: 5.4
11+
- php: 5.5
12+
- php: 5.6
13+
- php: 7.0
14+
- php: 7.1
15+
- php: 7.2
16+
- php: 7.3
17+
- php: 7.4
18+
- php: hhvm-3.18
2019
allow_failures:
21-
- php: hhvm
20+
- php: hhvm-3.18
2221

2322
install:
2423
- composer install --no-interaction

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@
1010
"require": {
1111
"php": ">=5.3.8",
1212
"react/cache": "^1.0",
13-
"react/dns": "^1.1",
13+
"react/dns": "^1.3",
1414
"react/event-loop": "^1.0",
1515
"react/promise": "^2.1 || ^1.2",
1616
"react/promise-stream": "^1.1.1",
17+
"react/promise-timer": "^1.6",
1718
"react/socket": "^1.4",
1819
"react/stream": "^1.0"
1920
},
2021
"require-dev": {
21-
"phpunit/phpunit": "^5.7 || ^4.8.35",
2222
"clue/block-react": "^1.1",
23-
"clue/stream-filter": "^1.3"
23+
"clue/stream-filter": "^1.3",
24+
"phpunit/phpunit": "^7.0 || ^6.0 || ^5.7 || ^4.8.35"
2425
},
2526
"config": {
2627
"preferred-install": {

phpunit.xml.dist

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<phpunit backupGlobals="false"
4-
backupStaticAttributes="false"
5-
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="false"
11-
syntaxCheck="false"
12-
bootstrap="tests/bootstrap.php"
13-
>
3+
<phpunit bootstrap="tests/bootstrap.php" colors="true">
144
<testsuites>
15-
<testsuite name="React Test Suite">
5+
<testsuite name="ReactPHP Test Suite">
166
<directory>./vendor/react/*/tests/</directory>
177
</testsuite>
188
</testsuites>

0 commit comments

Comments
 (0)