Run tests on PHP 7.4 and simplify test matrix

clue · Mar 28, 2020 · dae7cbd · dae7cbd
1 parent b2b6a73
commit dae7cbd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,24 +1,25 @@
 language: php
 
-php:
-# - 5.3 # requires old distro
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 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
+    - 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
   allow_failures:
-    - php: hhvm
+    - php: hhvm-3.18
 
 sudo: false
 

diff --git a/composer.json b/composer.json
@@ -22,6 +22,6 @@
     "require-dev": {
         "clue/buzz-react": "^2.3",
         "clue/ndjson-react": "^1.0",
-        "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"
+        "phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -7,7 +7,7 @@
          convertWarningsToExceptions="true"
 >
     <testsuites>
-        <testsuite>
+        <testsuite name="Flux test suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>