Merge pull request reactphp#439 from clue-labs/tests

Run tests on PHP 7.4 and simplify test matrix

Author: jsor

.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
-
 # 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

composer.json

@@ -10,16 +10,22 @@
     "require": {
         "php": ">=5.3.8",
         "react/cache": "^1.0",
-        "react/dns": "^1.0",
+        "react/dns": "^1.3",
         "react/event-loop": "^1.0",
         "react/promise": "^2.1 || ^1.2",
         "react/promise-stream": "^1.1.1",
-        "react/socket": "^1.0",
+        "react/promise-timer": "^1.6",
+        "react/socket": "^1.4",
         "react/stream": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7 || ^4.8.35",
         "clue/block-react": "^1.1",
-        "clue/stream-filter": "^1.3"
+        "clue/stream-filter": "^1.3",
+        "phpunit/phpunit": "^7.0 || ^6.0 || ^5.7 || ^4.8.35"
+    },
+    "config": {
+        "preferred-install": {
+            "react/*": "source"
+        }
     }
 }

phpunit.xml.dist

@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
->
+<phpunit bootstrap="tests/bootstrap.php" colors="true">
     <testsuites>
-        <testsuite name="React Test Suite">
+        <testsuite name="ReactPHP Test Suite">
             <directory>./vendor/react/*/tests/</directory>
-            <!-- temporarily skip broken tests, see https://github.com/reactphp/socket/issues/207 -->
-            <exclude>./vendor/react/socket/tests/ConnectorTest.php</exclude>
-            <exclude>./vendor/react/socket/tests/DnsConnectorTest.php</exclude>
+            <!-- temporarily skip broken tests, see https://github.com/reactphp/dns/pull/164 -->
+            <exclude>./vendor/react/dns/tests/FunctionalResolverTest.php</exclude>
+            <exclude>./vendor/react/dns/tests/Query/CoopExecutorTest.php</exclude>
+            <exclude>./vendor/react/dns/tests/Query/SelectiveTransportExecutorTest.php</exclude>
         </testsuite>
     </testsuites>