Skip to content

Commit 1a849e7

Browse files
authored
Merge pull request #147 from clue-labs/php7.4
Run tests on PHP 7.4 and simplify test matrix
2 parents 2b9e19d + 860446f commit 1a849e7

File tree

3 files changed

+13
-18
lines changed

3 files changed

+13
-18
lines changed

.travis.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,30 @@
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.0 # Mac OS X test setup, ignore errors, see below
10-
- 7.1
11-
- 7.2
12-
- 7.3
13-
- nightly # ignore errors, see below
14-
- hhvm # ignore errors, see below
15-
163
# lock distro so new future defaults will not break the build
174
dist: trusty
185

196
matrix:
207
include:
218
- php: 5.3
229
dist: precise
23-
include:
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
19+
install:
20+
- composer require phpunit/phpunit:^5 --dev --no-interaction # requires legacy phpunit
2421
- os: osx
2522
language: generic
2623
php: 7.0 # just to look right on travis
2724
env:
2825
- PACKAGE: php70
2926
allow_failures:
30-
- php: nightly
31-
- php: hhvm
27+
- php: hhvm-3.18
3228
- os: osx
3329

3430
install:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"evenement/evenement": "^3.0 || ^2.0 || ^1.0"
1010
},
1111
"require-dev": {
12-
"phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35",
12+
"phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35",
1313
"clue/stream-filter": "~1.2"
1414
},
1515
"autoload": {

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)