Run tests on PHPUnit 9 and clean up test suite

composer.json

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

phpunit.xml.dist

@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="vendor/autoload.php"
->
+<phpunit bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="React Test Suite">
             <directory>./tests/</directory>

tests/Config/ConfigTest.php

@@ -32,11 +32,9 @@ public function testLoadsFromExplicitPath()
         $this->assertEquals(array('8.8.8.8'), $config->nameservers);
     }
 
-    /**
-     * @expectedException RuntimeException
-     */
     public function testLoadThrowsWhenPathIsInvalid()
     {
+        $this->setExpectedException('RuntimeException');
         Config::loadResolvConfBlocking(__DIR__ . '/invalid.conf');
     }
 

tests/Config/HostsFileTest.php

@@ -25,11 +25,9 @@ public function testDefaultShouldHaveLocalhostMapped()
         $this->assertContains('127.0.0.1', $hosts->getIpsForHost('localhost'));
     }
 
-    /**
-     * @expectedException RuntimeException
-     */
     public function testLoadThrowsForInvalidPath()
     {
+        $this->setExpectedException('RuntimeException');
         HostsFile::loadFromPathBlocking('does/not/exist');
     }
 

tests/FunctionalResolverTest.php

@@ -9,7 +9,10 @@
 
 class FunctionalTest extends TestCase
 {
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpResolver()
     {
         $this->loop = LoopFactory::create();