Forward compatibility with PHPUnit 6

composer.json

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

tests/Config/FilesystemFactoryTest.php

@@ -2,9 +2,10 @@
 
 namespace React\Test\Dns\Config;
 
+use PHPUnit\Framework\TestCase;
 use React\Dns\Config\FilesystemFactory;
 
-class FilesystemFactoryTest extends \PHPUnit_Framework_TestCase
+class FilesystemFactoryTest extends TestCase
 {
     /** @test */
     public function parseEtcResolvConfShouldParseCorrectly()

tests/Model/MessageTest.php

@@ -2,10 +2,11 @@
 
 namespace React\Tests\Dns\Model;
 
+use PHPUnit\Framework\TestCase;
 use React\Dns\Query\Query;
 use React\Dns\Model\Message;
 
-class MessageTest extends \PHPUnit_Framework_TestCase
+class MessageTest extends TestCase
 {
     public function testCreateRequestDesiresRecusion()
     {

tests/Protocol/BinaryDumperTest.php

@@ -2,10 +2,11 @@
 
 namespace React\Tests\Dns\Protocol;
 
+use PHPUnit\Framework\TestCase;
 use React\Dns\Protocol\BinaryDumper;
 use React\Dns\Model\Message;
 
-class BinaryDumperTest extends \PHPUnit_Framework_TestCase
+class BinaryDumperTest extends TestCase
 {
     public function testRequestToBinary()
     {

tests/Protocol/ParserTest.php

@@ -2,10 +2,11 @@
 
 namespace React\Tests\Dns\Protocol;
 
+use PHPUnit\Framework\TestCase;
 use React\Dns\Protocol\Parser;
 use React\Dns\Model\Message;
 
-class ParserTest extends \PHPUnit_Framework_TestCase
+class ParserTest extends TestCase
 {
     public function setUp()
     {

tests/Query/RecordBagTest.php

@@ -2,11 +2,12 @@
 
 namespace React\Tests\Dns\Query;
 
+use PHPUnit\Framework\TestCase;
 use React\Dns\Query\RecordBag;
 use React\Dns\Model\Message;
 use React\Dns\Model\Record;
 
-class RecordBagTest extends \PHPUnit_Framework_TestCase
+class RecordBagTest extends TestCase
 {
     /**
     * @covers React\Dns\Query\RecordBag

tests/Query/RecordCacheTest.php

@@ -2,14 +2,15 @@
 
 namespace React\Tests\Dns\Query;
 
+use PHPUnit\Framework\TestCase;
 use React\Cache\ArrayCache;
 use React\Dns\Model\Message;
 use React\Dns\Model\Record;
 use React\Dns\Query\RecordCache;
 use React\Dns\Query\Query;
 use React\Promise\PromiseInterface;
 
-class RecordCacheTest extends \PHPUnit_Framework_TestCase
+class RecordCacheTest extends TestCase
 {
     /**
     * @covers React\Dns\Query\RecordCache

tests/Resolver/ResolveAliasesTest.php

@@ -2,12 +2,13 @@
 
 namespace React\Tests\Dns\Resolver;
 
+use PHPUnit\Framework\TestCase;
 use React\Dns\Resolver\Resolver;
 use React\Dns\Query\Query;
 use React\Dns\Model\Message;
 use React\Dns\Model\Record;
 
-class ResolveAliasesTest extends \PHPUnit_Framework_TestCase
+class ResolveAliasesTest extends TestCase
 {
     /**
      * @covers React\Dns\Resolver\Resolver::resolveAliases

tests/TestCase.php

@@ -2,7 +2,9 @@
 
 namespace React\Tests\Dns;
 
-abstract class TestCase extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase as BaseTestCase;
+
+abstract class TestCase extends BaseTestCase
 {
     protected function expectCallableOnce()
     {
@@ -39,4 +41,21 @@ protected function createCallableMock()
     {
         return $this->getMockBuilder('React\Tests\Dns\CallableStub')->getMock();
     }
+
+    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);
+         }
+     }
 }