Upgraded PHPUnit

composer.json

@@ -40,8 +40,7 @@
     "kleijnweb/php-api-hydrator": "^v1.0.0-alpha2"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.2",
-    "phpunit/phpunit-mock-objects": "^3.1",
+    "phpunit/phpunit": "^6.4",
     "symfony/framework-bundle": ">=2.8.7",
     "symfony/security-bundle": ">=2.8.7",
     "symfony/monolog-bridge": ">=2.8.7",

tests/unit/BundleTest.php

@@ -10,8 +10,9 @@
 
 use KleijnWeb\PhpApi\RoutingBundle\DependencyInjection\PhpApiRoutingExtension;
 use KleijnWeb\PhpApi\RoutingBundle\PhpApiRoutingBundle;
+use PHPUnit\Framework\TestCase;
 
-class BundleTest extends \PHPUnit_Framework_TestCase
+class BundleTest extends TestCase
 {
     /**
      * @test

tests/unit/DependencyInjection/ConfigurationTest.php

@@ -14,8 +14,9 @@
 
 use KleijnWeb\PhpApi\RoutingBundle\DependencyInjection\Configuration;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use PHPUnit\Framework\TestCase;
 
-class ConfigurationTest extends \PHPUnit_Framework_TestCase
+class ConfigurationTest extends TestCase
 {
     /**
      * @test

tests/unit/DependencyInjection/ExtensionTest.php

@@ -10,8 +10,9 @@
 
 use KleijnWeb\PhpApi\RoutingBundle\DependencyInjection\PhpApiRoutingExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use PHPUnit\Framework\TestCase;
 
-class ExtensionTest extends \PHPUnit_Framework_TestCase
+class ExtensionTest extends TestCase
 {
     /**
      * @var PhpApiRoutingExtension

tests/unit/Routing/OpenApiRouteLoaderTest.php

@@ -17,11 +17,12 @@
 use KleijnWeb\PhpApi\Descriptions\Description\Schema\Schema;
 use KleijnWeb\PhpApi\RoutingBundle\Routing\OpenApiRouteLoader;
 use Symfony\Component\Routing\Route;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author John Kleijn <john@kleijnweb.nl>
  */
-class OpenApiRouteLoaderTest extends \PHPUnit_Framework_TestCase
+class OpenApiRouteLoaderTest extends TestCase
 {
     const DOCUMENT_PATH = '/totally/non-existent/path';
 
@@ -73,20 +74,6 @@ public function supportSwaggerAsRouteTypeOnly()
         $this->assertTrue($this->loader->supports('/a/b/c', 'customname'));
     }
 
-    /**
-     * @test
-     */
-    public function canLoadMultipleDocuments()
-    {
-        $this->decriptionMock
-            ->expects($this->any())
-            ->method('getPaths')
-            ->willReturn([]);
-
-        $this->loader->load(self::DOCUMENT_PATH);
-        $this->loader->load(self::DOCUMENT_PATH . '2');
-    }
-
     /**
      * @test
      */

tests/unit/Routing/RequestMetaTest.php

@@ -14,11 +14,13 @@
 use KleijnWeb\PhpApi\Descriptions\Description\Repository;
 use KleijnWeb\PhpApi\RoutingBundle\Routing\RequestMeta;
 use Symfony\Component\HttpFoundation\Request;
+use PHPUnit\Framework\TestCase;
+
 
 /**
  * @author John Kleijn <john@kleijnweb.nl>
  */
-class RequestMetaTest extends \PHPUnit_Framework_TestCase
+class RequestMetaTest extends TestCase
 {
     /**
      * @test