From 4e3216a73145b331311948f507c5ad6c1260288f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@clue.engineering>
Date: Thu, 9 Jan 2020 13:28:59 +0100
Subject: [PATCH] Run tests on PHP 7.4 and simply test matrix

---
 .travis.yml | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9ff354b..e840ca7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,5 @@
 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
 
@@ -20,15 +7,24 @@ 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: