Merge pull request #13 from copynpaste/phpunit-update

Update PHPUnit

Author: Nyholm

composer.json

@@ -12,10 +12,10 @@
     ],
     "require": {
         "php": ">=5.4",
-        "psr/http-message": "^1.0"
+        "psr/http-message": "^1.0",
+        "phpunit/phpunit": "^5.4|^6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8 || ^5.0",
         "zendframework/zend-diactoros": "^1.0",
         "guzzlehttp/psr7": "^1.0",
         "slim/slim": "^3.0",
@@ -26,9 +26,9 @@
             "Http\\Psr7Test\\": "src/"
         }
     },
-    "autoloaddev": {
+    "autoload-dev": {
         "psr-4": {
-            "Http\\Psr7Test\\Tests": "tests/"
+            "Http\\Psr7Test\\Tests\\": "tests/"
         }
     },
     "scripts": {

src/BaseTest.php

@@ -5,6 +5,7 @@
 use GuzzleHttp\Psr7\Stream as GuzzleStream;
 use GuzzleHttp\Psr7\UploadedFile as GuzzleUploadedFile;
 use GuzzleHttp\Psr7\Uri as GuzzleUri;
+use PHPUnit\Framework\TestCase;
 use Slim\Http\Uri as SlimUri;
 use Zend\Diactoros\Stream as ZendStream;
 use Zend\Diactoros\Uri as ZendUri;
@@ -13,7 +14,7 @@
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class BaseTest extends \PHPUnit_Framework_TestCase
+class BaseTest extends TestCase
 {
     protected function assertNotSameObject($a, $b)
     {