From a0878a066780a12774e68ec76a7076a28dffa17b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@lueck.tv>
Date: Tue, 29 Jan 2019 18:57:56 +0100
Subject: [PATCH 1/2] Forward compatibility with PHPUnit 7

---
 composer.json    | 2 +-
 phpunit.xml.dist | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 40010c2e..7224ae09 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
     },
     "require-dev": {
         "clue/block-react": "^1.2",
-        "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"
+        "phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35"
     },
     "autoload": {
         "psr-4": { "React\\Dns\\": "src" }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 13d3fab0..04d426b5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="vendor/autoload.php"
 >
     <testsuites>

From 488f2becdbd9aa413135dcef5bb53a5e743750c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@lueck.tv>
Date: Tue, 29 Jan 2019 18:58:33 +0100
Subject: [PATCH 2/2] Test against PHP 7.3 and use legacy PHPUnit 5 on legacy
 HHVM

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 41921e31..459e8526 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,8 @@ php:
   - 7.0
   - 7.1
   - 7.2
-  - hhvm # ignore errors, see below
+  - 7.3
+# - hhvm # requires legacy phpunit & ignore errors, see below
 
 # lock distro so new future defaults will not break the build
 dist: trusty
@@ -17,6 +18,8 @@ matrix:
   include:
     - php: 5.3
       dist: precise
+    - php: hhvm
+      install: composer require phpunit/phpunit:^5 --dev --no-interaction
   allow_failures:
     - php: hhvm