Skip to content

Commit

Permalink
Merge pull request #147 from clue-labs/php7.4
Browse files Browse the repository at this point in the history
Run tests on PHP 7.4 and simplify test matrix
  • Loading branch information
WyriHaximus authored Jan 9, 2020
2 parents 2b9e19d + 860446f commit 1a849e7
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 18 deletions.
28 changes: 12 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,30 @@
language: php

php:
# - 5.3 # requires old distro, see below
- 5.4
- 5.5
- 5.6
- 7.0
# - 7.0 # Mac OS X test setup, ignore errors, see below
- 7.1
- 7.2
- 7.3
- nightly # ignore errors, see below
- hhvm # ignore errors, see below

# lock distro so new future defaults will not break the build
dist: trusty

matrix:
include:
- php: 5.3
dist: precise
include:
- php: 5.4
- php: 5.5
- php: 5.6
- php: 7.0
- php: 7.1
- php: 7.2
- php: 7.3
- php: 7.4
- php: hhvm-3.18
install:
- composer require phpunit/phpunit:^5 --dev --no-interaction # requires legacy phpunit
- os: osx
language: generic
php: 7.0 # just to look right on travis
env:
- PACKAGE: php70
allow_failures:
- php: nightly
- php: hhvm
- php: hhvm-3.18
- os: osx

install:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"evenement/evenement": "^3.0 || ^2.0 || ^1.0"
},
"require-dev": {
"phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35",
"phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35",
"clue/stream-filter": "~1.2"
},
"autoload": {
Expand Down
1 change: 0 additions & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
bootstrap="vendor/autoload.php"
>
<testsuites>
Expand Down

0 comments on commit 1a849e7

Please sign in to comment.