Merge pull request #46 from SimonFrings/php7.4

clue · web-flow · commit 60fb1dcad451 · 2020-05-06T11:02:41.000+02:00
Run tests on PHP 7.4 and simplify test matrix
diff --git a/.travis.yml b/.travis.yml
@@ -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 # 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
   allow_failures:
-    - php: hhvm
+    - php: hhvm-3.18
 
 install:
   - composer install --no-interaction
diff --git a/tests/FunctionAwaitAllTest.php b/tests/FunctionAwaitAllTest.php
@@ -115,6 +115,7 @@ public function testAwaitAllPendingPromiseWithTimeoutAndCancellerShouldNotCreate
         }
 
         gc_collect_cycles();
+        gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
 
         $promise = new \React\Promise\Promise(function () { }, function () {
             throw new RuntimeException();

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ public function testAwaitAllPendingPromiseWithTimeoutAndCancellerShouldNotCreate`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`gc_collect_cycles();`
	`118`	`+ gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on`
`118`	`119`
`119`	`120`	`$promise = new \React\Promise\Promise(function () { }, function () {`
`120`	`121`	`throw new RuntimeException();`