Clean up test suite

Author: SimonFrings

.travis.yml

@@ -18,9 +18,9 @@ matrix:
     - php: 7.2
     - php: 7.3
     - php: 7.4
-    - php: hhvm
+    - php: hhvm-3.18
   allow_failures:
-    - php: hhvm
+    - php: hhvm-3.18
 
 install:
   - composer install --no-interaction

composer.json

@@ -12,13 +12,14 @@
         "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
         "react/promise-stream": "^1.1"
     },
-    "autoload": {
-        "psr-4": {
-            "React\\Http\\": "src"
-        }
-    },
     "require-dev": {
         "clue/block-react": "^1.1",
         "phpunit/phpunit": "^9.0 || ^5.7 || ^4.8.35"
+    },
+    "autoload": {
+        "psr-4": { "React\\Http\\": "src" }
+    },
+    "autoload-dev": {
+        "psr-4": { "React\\Tests\\Http\\": "tests" }
     }
 }

phpunit.xml.dist

@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="tests/bootstrap.php"
->
+<phpunit bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="React Test Suite">
             <directory>./tests/</directory>

tests/FunctionalServerTest.php

@@ -127,8 +127,8 @@ public function testPlainHttpOnRandomPortWithOtherHostHeaderTakesPrecedence()
 
     public function testSecureHttpsOnRandomPort()
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on HHVM');
         }
 
         $loop = Factory::create();
@@ -162,8 +162,8 @@ public function testSecureHttpsOnRandomPort()
 
     public function testSecureHttpsReturnsData()
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on HHVM');
         }
 
         $loop = Factory::create();
@@ -203,8 +203,8 @@ public function testSecureHttpsReturnsData()
 
     public function testSecureHttpsOnRandomPortWithoutHostHeaderUsesSocketUri()
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on HHVM');
         }
 
         $loop = Factory::create();

tests/Io/RequestHeaderParserTest.php

@@ -715,6 +715,10 @@ public function testServerParamsWillNotSetRemoteAddressForUnixDomainSockets()
 
     public function testServerParamsWontBeSetOnMissingUrls()
     {
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on HHVM');
+        }
+
         $request = null;
 
         $parser = new RequestHeaderParser();

tests/TestCase.php

@@ -63,9 +63,7 @@ protected function expectCallableConsecutive($numberOfCalls, array $with)
 
     protected function createCallableMock()
     {
-        return $this
-            ->getMockBuilder('React\Tests\Http\CallableStub')
-            ->getMock();
+        return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
     }
 
     public function assertContainsString($needle, $haystack)