Run tests on PHPUnit 9

composer.json

@@ -22,7 +22,7 @@
         "react/socket": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0 || ^6.0 || ^5.7 || ^4.8.35",
+        "phpunit/phpunit": "^9.0 || ^7.0 || ^6.0 || ^5.7 || ^4.8.35",
         "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3",
         "clue/connection-manager-extra": "^1.0 || ^0.7",
         "clue/block-react": "^1.1"

tests/ClientTest.php

@@ -16,7 +16,10 @@ class ClientTest extends TestCase
     /** @var  Client */
     private $client;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpMocks()
     {
         $this->loop = \React\EventLoop\Factory::create();
         $this->connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
@@ -72,11 +75,9 @@ public function testCtorAcceptsUriWithSocks5UnixScheme()
         $this->assertTrue(true);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testCtorThrowsForInvalidUri()
     {
+        $this->setExpectedException("InvalidArgumentException");
         new Client('////', $this->connector);
     }
 
@@ -87,11 +88,9 @@ public function testValidAuthFromUri()
         $this->assertTrue(true);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidAuthInformation()
     {
+        $this->setExpectedException("InvalidArgumentException");
         new Client(str_repeat('a', 256) . ':[email protected]', $this->connector);
     }
 
@@ -102,19 +101,15 @@ public function testValidAuthAndVersionFromUri()
         $this->assertTrue(true);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidCanNotSetAuthenticationForSocks4Uri()
     {
+        $this->setExpectedException("InvalidArgumentException");
         $this->client = new Client('socks4://username:[email protected]:9050', $this->connector);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidProtocolVersion()
     {
+        $this->setExpectedException("InvalidArgumentException");
         $this->client = new Client('socks3://127.0.0.1:9050', $this->connector);
     }
 

tests/FunctionalTest.php

@@ -20,7 +20,10 @@ class FunctionalTest extends TestCase
     private $port;
     private $server;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpClientServer()
     {
         $this->loop = \React\EventLoop\Factory::create();
 

tests/ServerTest.php

@@ -14,7 +14,10 @@ class ServerTest extends TestCase
     /** @var Server */
     private $server;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpServer()
     {
         $this->loop = $this->getMockBuilder('React\EventLoop\LoopInterface')
             ->getMock();
@@ -54,11 +57,9 @@ public function testConstructorWithStaticAuthArray()
         ));
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testConstructorWithInvalidAuthenticatorThrows()
     {
+        $this->setExpectedException("InvalidArgumentException");
         new Server($this->loop, $this->connector, true);
     }
 

tests/StreamReaderTest.php

@@ -8,7 +8,10 @@ class StreamReaderTest extends TestCase
 {
     private $reader;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpReader()
     {
         $this->reader = new StreamReader();
     }
@@ -66,19 +69,15 @@ public function testSequence()
         $this->assertEquals('rld', $this->reader->getBuffer());
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidStructure()
     {
+        $this->setExpectedException("InvalidArgumentException");
         $this->reader->readBinary(array('invalid' => 'y'));
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidCallback()
     {
+        $this->setExpectedException("InvalidArgumentException");
         $this->reader->readBufferCallback(array());
     }
 }

tests/TestCase.php

@@ -83,4 +83,18 @@ protected function expectPromiseReject($promise)
 
         return $promise;
     }
+
+    public function setExpectedException($exception, $message = '', $code = 0)
+    {
+        if (method_exists($this, 'expectException')) {
+            $this->expectException($exception);
+            if ($message !== '') {
+                $this->expectExceptionMessage($message);
+            }
+            $this->expectExceptionCode($code);
+        } else {
+            parent::setExpectedException($exception, $message, $code);
+        }
+    }
+
 }