Support PHPUnit 6

Author: carusogabriel

composer.json

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

tests/IntegrationTest.php

@@ -98,7 +98,6 @@ public function gettingPlaintextStuffFromEncryptedGoogleShouldNotWork()
         $this->assertNotRegExp('#^HTTP/1\.0#', $response);
     }
 
-    /** @test */
     public function testConnectingFailsIfDnsUsesInvalidResolver()
     {
         $loop = Factory::create();
@@ -114,7 +113,6 @@ public function testConnectingFailsIfDnsUsesInvalidResolver()
         Block\await($connector->connect('google.com:80'), $loop, self::TIMEOUT);
     }
 
-    /** @test */
     public function testConnectingFailsIfTimeoutIsTooSmall()
     {
         if (!function_exists('stream_socket_enable_crypto')) {
@@ -131,7 +129,6 @@ public function testConnectingFailsIfTimeoutIsTooSmall()
         Block\await($connector->connect('google.com:80'), $loop, self::TIMEOUT);
     }
 
-    /** @test */
     public function testSelfSignedRejectsIfVerificationIsEnabled()
     {
         if (!function_exists('stream_socket_enable_crypto')) {
@@ -150,7 +147,6 @@ public function testSelfSignedRejectsIfVerificationIsEnabled()
         Block\await($connector->connect('tls://self-signed.badssl.com:443'), $loop, self::TIMEOUT);
     }
 
-    /** @test */
     public function testSelfSignedResolvesIfVerificationIsDisabled()
     {
         if (!function_exists('stream_socket_enable_crypto')) {

tests/TestCase.php

@@ -81,4 +81,21 @@ function () use ($stream) {
             }
         ), $loop, $timeout);
     }
+
+    public function setExpectedException($exception, $exceptionMessage = '', $exceptionCode = null)
+    {
+        if (method_exists($this, 'expectException')) {
+            // PHPUnit 5+
+            $this->expectException($exception);
+            if ($exceptionMessage !== '') {
+                $this->expectExceptionMessage($exceptionMessage);
+            }
+            if ($exceptionCode !== null) {
+                $this->expectExceptionCode($exceptionCode);
+            }
+        } else {
+            // legacy PHPUnit 4
+            parent::setExpectedException($exception, $exceptionMessage, $exceptionCode);
+        }
+    }
 }