Skip to content

Commit

Permalink
Run tests on PHP 7.4 and simplify test matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
clue committed Jul 10, 2020
1 parent 57ac1c9 commit 52f330e
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 26 deletions.
21 changes: 10 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
language: php

php:
# - 5.3 # requires old distro, see below
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2
- hhvm

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

matrix:
include:
- php: 5.3
dist: precise
- 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
allow_failures:
- php: hhvm
- php: hhvm-3.18

install:
- composer install --no-interaction
Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,18 @@
"require": {
"php": ">=5.3.8",
"react/cache": "^1.0",
"react/dns": "^1.1",
"react/dns": "^1.3",
"react/event-loop": "^1.0",
"react/promise": "^2.1 || ^1.2",
"react/promise-stream": "^1.1.1",
"react/promise-timer": "^1.6",
"react/socket": "^1.4",
"react/stream": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^5.7 || ^4.8.35",
"clue/block-react": "^1.1",
"clue/stream-filter": "^1.3"
"clue/stream-filter": "^1.3",
"phpunit/phpunit": "^7.0 || ^6.0 || ^5.7 || ^4.8.35"
},
"config": {
"preferred-install": {
Expand Down
14 changes: 2 additions & 12 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit backupGlobals="false"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
bootstrap="tests/bootstrap.php"
>
<phpunit bootstrap="tests/bootstrap.php" colors="true">
<testsuites>
<testsuite name="React Test Suite">
<testsuite name="ReactPHP Test Suite">
<directory>./vendor/react/*/tests/</directory>
</testsuite>
</testsuites>
Expand Down

0 comments on commit 52f330e

Please sign in to comment.