Merge pull request #223 from clue-labs/php7.4

Run tests on PHP 7.4 and simplify test matrix

Author: jsor

.travis.yml

@@ -1,31 +1,29 @@
 language: php
 
-php:
-# - 5.3 # requires old distro, see below
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-# - 7.0 # Mac OS X, ignore errors, see below
-  - 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
     - os: osx
       language: generic
       php: 7.0 # just to look right on travis
       env:
         - PACKAGE: php70
   allow_failures:
-    - php: hhvm
+    - php: hhvm-3.18
     - os: osx
 
 sudo: false
@@ -46,4 +44,4 @@ install:
   - composer install --no-interaction
 
 script:
-  - ./vendor/bin/phpunit --coverage-text
+  - vendor/bin/phpunit --coverage-text

composer.json

@@ -14,7 +14,7 @@
     },
     "require-dev": {
         "clue/block-react": "^1.2",
-        "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"
+        "phpunit/phpunit": "^7.5 || ^6.4 || ^5.7 || ^4.8.35"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="vendor/autoload.php"
 >
     <testsuites>

tests/DnsConnectorTest.php

@@ -202,6 +202,7 @@ public function testRejectionDuringDnsLookupShouldNotCreateAnyGarbageReferences(
         }
 
         gc_collect_cycles();
+        gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
 
         $dns = new Deferred();
         $this->resolver->expects($this->once())->method('resolve')->with($this->equalTo('example.com'))->willReturn($dns->promise());

tests/IntegrationTest.php

@@ -124,6 +124,8 @@ public function testCancellingPendingConnectionWithoutTimeoutShouldNotCreateAnyG
         $connector = new Connector($loop, array('timeout' => false));
 
         gc_collect_cycles();
+        gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
+
         $promise = $connector->connect('8.8.8.8:80');
         $promise->cancel();
         unset($promise);

tests/SecureConnectorTest.php

@@ -167,6 +167,7 @@ public function testRejectionDuringConnectionShouldNotCreateAnyGarbageReferences
         }
 
         gc_collect_cycles();
+        gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
 
         $tcp = new Deferred();
         $this->tcp->expects($this->once())->method('connect')->willReturn($tcp->promise());

tests/TcpConnectorTest.php

@@ -268,6 +268,7 @@ public function testCancelDuringConnectionShouldNotCreateAnyGarbageReferences()
         }
 
         gc_collect_cycles();
+        gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
 
         $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
         $connector = new TcpConnector($loop);