From b3089929fa85e4b1a4114042149f7aba45a7ccdc Mon Sep 17 00:00:00 2001
From: Simon Frings <simon@clue.engineering>
Date: Mon, 4 May 2020 13:38:06 +0200
Subject: [PATCH 1/2] Run tests on PHP 7.4 and simplify test matrix

---
 .travis.yml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d78affb..3fb051c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,5 @@
 language: php
 
-php:
-# - 5.3 # requires old distro, see below
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-  - hhvm # ignore errors, see below
-
 # lock distro so new future defaults will not break the build
 dist: trusty
 
@@ -19,8 +8,17 @@ matrix:
     - php: 5.3
       dist: precise
       install: composer remove react/mysql --dev --no-interaction # do not install react/mysql example on legacy PHP
+    - 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
 
 sudo: false
 

From e578092deb756d6c5700aeec0961555acea58a4b Mon Sep 17 00:00:00 2001
From: Simon Frings <simon@clue.engineering>
Date: Mon, 4 May 2020 17:37:46 +0200
Subject: [PATCH 2/2] Skip faulty test on HHVM

---
 tests/Io/FunctionsTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/Io/FunctionsTest.php b/tests/Io/FunctionsTest.php
index 494be8e..6d17868 100644
--- a/tests/Io/FunctionsTest.php
+++ b/tests/Io/FunctionsTest.php
@@ -47,6 +47,10 @@ public function testFdsWithInvalidPathReturnsSubsetOfFdsFromDevFd()
             $this->markTestSkipped('Unable to read /dev/fd');
         }
 
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on HHVM');
+        }
+
         $fds = Io\fds();
         $second = Io\fds('/dev/null');