Upgrade to PHPUnit 8

.travis.yml

@@ -19,4 +19,4 @@ before_script:
   - sh docker/waitForPostgres.sh
 
 script:
-  - vendor/bin/phpunit
+  - vendor/bin/phpunit --testdox

composer.json

@@ -39,7 +39,7 @@
     "evenement/evenement": "^2.0 | ^3.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.7",
+    "phpunit/phpunit": "^8",
     "react/dns": "^1.0"
   }
 }

phpunit.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<phpunit
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
         backupGlobals="false"
         backupStaticAttributes="false"
         colors="true"
@@ -8,7 +9,6 @@
         convertWarningsToExceptions="true"
         processIsolation="false"
         stopOnFailure="false"
-        syntaxCheck="false"
         bootstrap="tests/bootstrap.php">
     <testsuites>
         <testsuite name="PgAsync Tests">

tests/Integration/ConnectionTest.php

@@ -205,31 +205,44 @@ function () {
 
     public function testCancellationUsingDispose()
     {
+        $this->markTestSkipped('We have disabled cancellation for the time being.');
         $conn = new Connection([
             "user"            => $this->getDbUser(),
-            "database"        => $this::getDbName()
+            "database"        => $this::getDbName(),
+            "auto_disconnect" => true
         ], $this->getLoop());
 
-        $testQuery = $conn->query("SELECT pg_sleep(10)")->mapTo(1);
+        $disposed = false;
 
-        $testQuery->takeUntil(Observable::timer(500))->subscribe(
+        $testQuery = $conn->query("SELECT pg_sleep(10)")
+            ->mapTo(1)
+            ->finally(function () use (&$disposed) {
+                $disposed = true;
+            });
+
+        //$disposable = $testQuery->takeUntil(Observable::timer(500))->subscribe(
+        $disposable = $testQuery->subscribe(
             function ($results) {
-                $this->fail('Expected no value');
                 $this->stopLoop();
+                $this->fail('Expected no value');
             },
             function (\Throwable $e) {
-                $this->fail('Expected no error');
                 $this->stopLoop();
+                $this->fail('Expected no error');
             },
             function () {
                 $this->stopLoop();
+                $this->fail('Expected no completion');
             }
         );
 
+        $this->getLoop()->addTimer(500, function () use ($disposable) {
+            $disposable->dispose();
+        });
+
         $this->runLoopWithTimeout(2);
 
-        $conn->disconnect();
-        $this->getLoop()->run();
+        $this->assertTrue($disposed);
     }
 
     public function testCancellationUsingInternalFunctions()

tests/Unit/ConnectionTest.php

@@ -5,27 +5,21 @@
 
 class ConnectionTest extends TestCase
 {
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testInvalidParametersThrows()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $conn = new Connection(['something' => ''], $this->getLoop());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testNoUserThrows()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $conn = new Connection(["database" => "some_database"], $this->getLoop());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testNoDatabaseThrows()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $conn = new Connection(["user" => "some_user"], $this->getLoop());
     }
 }

tests/Unit/Message/MessageTest.php

@@ -1,6 +1,8 @@
 <?php
 
-class MessageTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class MessageTest extends TestCase
 {
     public function testInt32()
     {