Add support for PHPUnit 8 (#41)

Author: theodorejb

.gitignore

@@ -1,4 +1,5 @@
 /.tmp
+/.phpunit.result.cache
 /behat.yml
 /build/
 /composer.lock

.travis.yml

@@ -7,7 +7,8 @@ cache:
         - $HOME/.composer/cache/files
 
 php:
-    - 7.1
+    - 7.2
+    - 7.3
 
 env:
     global:

composer.json

@@ -14,8 +14,8 @@
         }
     ],
     "require": {
-        "php": "^5.5 || ^7.0",
-        "phpunit/phpunit": "^5.4 || ^6.0 || ^7.0",
+        "php": "^7.2",
+        "phpunit/phpunit": "^8.0",
         "psr/http-message": "^1.0"
     },
     "require-dev": {

src/MessageTrait.php

@@ -82,7 +82,7 @@ public function testGetHeader()
         $this->assertCount(2, $message->getHeader('CONTENT-TYPE'));
         $emptyHeader = $message->getHeader('Bar');
         $this->assertCount(0, $emptyHeader);
-        $this->assertInternalType('array', $emptyHeader);
+        $this->assertIsArray($emptyHeader);
     }
 
     public function testGetHeaderLine()

src/RequestIntegrationTest.php

@@ -27,7 +27,7 @@ abstract class RequestIntegrationTest extends BaseTest
      */
     abstract public function createSubject();
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->request = $this->createSubject();
     }

src/ResponseIntegrationTest.php

@@ -26,7 +26,7 @@ abstract class ResponseIntegrationTest extends BaseTest
      */
     abstract public function createSubject();
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->response = $this->createSubject();
     }

src/ServerRequestIntegrationTest.php

@@ -24,7 +24,7 @@ abstract class ServerRequestIntegrationTest extends BaseTest
      */
     abstract public function createSubject();
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->serverRequest = $this->createSubject();
     }
@@ -114,10 +114,11 @@ public function validParsedBodyParams()
 
     /**
      * @dataProvider invalidParsedBodyParams
-     * @expectedException \InvalidArgumentException
      */
     public function testGetParsedBodyInvalid($value)
     {
+        $this->expectException('\InvalidArgumentException');
+
         if (isset($this->skippedTests[__FUNCTION__])) {
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
@@ -145,7 +146,7 @@ public function testGetAttributes()
 
         $new = $this->serverRequest->withAttribute('foo', 'bar');
         $oldAttributes = $this->serverRequest->getAttributes();
-        $this->assertInternalType('array', $oldAttributes, 'getAttributes MUST return an array');
+        $this->assertIsArray($oldAttributes, 'getAttributes MUST return an array');
         $this->assertEmpty($oldAttributes, 'withAttribute MUST be immutable');
         $this->assertEquals(['foo' => 'bar'], $new->getAttributes());
 

src/StreamIntegrationTest.php

@@ -238,10 +238,11 @@ public function testRewind()
 
     /**
      * @group internet
-     * @expectedException \RuntimeException
      */
     public function testRewindNotSeekable()
     {
+        $this->expectException('\RuntimeException');
+
         if (isset($this->skippedTests[__FUNCTION__])) {
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }

src/UploadedFileIntegrationTest.php

@@ -25,13 +25,13 @@ abstract class UploadedFileIntegrationTest extends BaseTest
      */
     abstract public function createSubject();
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         @mkdir('.tmp');
         parent::setUpBeforeClass();
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->uploadedFile = $this->createSubject();
     }