Run tests on PHPUnit 9

Author: SimonFrings

composer.json

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

tests/BaseTestCase.php

@@ -77,4 +77,21 @@ protected function expectCallableNever()
 
         return $mock;
     }
+
+    public function setExpectedException($exception, $exceptionMessage = '', $exceptionCode = null)
+    {
+        if (method_exists($this, 'expectException')) {
+            // PHPUnit 5.2+
+            $this->expectException($exception);
+            if ($exceptionMessage !== '') {
+                $this->expectExceptionMessage($exceptionMessage);
+            }
+            if ($exceptionCode !== null) {
+                $this->expectExceptionCode($exceptionCode);
+            }
+        } else {
+            // legacy PHPUnit 4 - PHPUnit 5.1
+            parent::setExpectedException($exception, $exceptionMessage, $exceptionCode);
+        }
+    }
 }

tests/Io/BufferTest.php

@@ -2,10 +2,10 @@
 
 namespace React\Tests\MySQL\Io;
 
-use PHPUnit\Framework\TestCase;
 use React\MySQL\Io\Buffer;
+use React\Tests\MySQL\BaseTestCase;
 
-class BufferTest extends TestCase
+class BufferTest extends BaseTestCase
 {
     public function testAppendAndReadBinary()
     {
@@ -16,15 +16,13 @@ public function testAppendAndReadBinary()
         $this->assertSame('hello', $buffer->read(5));
     }
 
-    /**
-     * @expectedException LogicException
-     */
     public function testReadBeyondLimitThrows()
     {
         $buffer = new Buffer();
 
         $buffer->append('hi');
 
+        $this->setExpectedException('LogicException');
         $buffer->read(3);
     }
 
@@ -38,27 +36,23 @@ public function testReadAfterSkipOne()
         $this->assertSame('i', $buffer->read(1));
     }
 
-    /**
-     * @expectedException LogicException
-     */
     public function testSkipZeroThrows()
     {
         $buffer = new Buffer();
 
         $buffer->append('hi');
 
+        $this->setExpectedException('LogicException');
         $buffer->skip(0);
     }
 
-    /**
-     * @expectedException LogicException
-     */
     public function testSkipBeyondLimitThrows()
     {
         $buffer = new Buffer();
 
         $buffer->append('hi');
 
+        $this->setExpectedException('LogicException');
         $buffer->skip(3);
     }
 
@@ -203,14 +197,12 @@ public function testParseStringNullCharacterTwice()
         $this->assertEquals('world', $buffer->readStringNull());
     }
 
-    /**
-     * @expectedException LogicException
-     */
     public function testParseStringNullCharacterThrowsIfNullNotFound()
     {
         $buffer = new Buffer();
         $buffer->append("hello");
 
+        $this->setExpectedException('LogicException');
         $buffer->readStringNull();
     }
 }

tests/Io/LazyConnectionTest.php

@@ -795,9 +795,6 @@ public function testQueryReturnsRejectedPromiseAfterConnectionIsClosed()
         $ret->then($this->expectCallableNever(), $this->expectCallableOnce());
     }
 
-    /**
-     * @expectedException React\MySQL\Exception
-     */
     public function testQueryStreamThrowsAfterConnectionIsClosed()
     {
         $factory = $this->getMockBuilder('React\MySQL\Factory')->disableOriginalConstructor()->getMock();
@@ -806,6 +803,8 @@ public function testQueryStreamThrowsAfterConnectionIsClosed()
         $connection = new LazyConnection($factory, '', $loop);
 
         $connection->close();
+
+        $this->setExpectedException('React\MySQL\Exception');
         $connection->queryStream('SELECT 1');
     }
 

tests/NoResultQueryTest.php

@@ -7,7 +7,10 @@
 
 class NoResultQueryTest extends BaseTestCase
 {
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpDataTable()
     {
         $connection = $this->createConnection(Loop::get());