Merge 5fc90d8 into 2991318

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,24 +10,19 @@
 
 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
-     */
-    public function canGetExtension()
+    public function testCanGetExtension()
     {
         $routingBundle = new PhpApiRoutingBundle();
-        $this->assertInstanceOf(PhpApiRoutingExtension::class, $routingBundle->getContainerExtension());
+        self::assertInstanceOf(PhpApiRoutingExtension::class, $routingBundle->getContainerExtension());
     }
 
-    /**
-     * @test
-     */
-    public function canGetNamespace()
+    public function testCanGetNamespace()
     {
         $routingBundle = new PhpApiRoutingBundle();
-        $this->assertSame('KleijnWeb\PhpApi\RoutingBundle', $routingBundle->getNamespace());
+        self::assertSame('KleijnWeb\PhpApi\RoutingBundle', $routingBundle->getNamespace());
     }
 }

tests/unit/DependencyInjection/ConfigurationTest.php

@@ -11,18 +11,15 @@
 
 namespace FOS\HttpCacheBundle\Tests\Unit\DependencyInjection;
 
-
 use KleijnWeb\PhpApi\RoutingBundle\DependencyInjection\Configuration;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 
-class ConfigurationTest extends \PHPUnit_Framework_TestCase
+class ConfigurationTest extends TestCase
 {
-    /**
-     * @test
-     */
-    public function willReturnTreeBuilder()
+    public function testWillReturnTreeBuilder()
     {
         $extension =  new Configuration();
-        $this->assertInstanceOf(TreeBuilder::class, $extension->getConfigTreeBuilder());
+        self::assertInstanceOf(TreeBuilder::class, $extension->getConfigTreeBuilder());
     }
-}
+}

tests/unit/DependencyInjection/ExtensionTest.php

@@ -9,9 +9,10 @@
 namespace KleijnWeb\PhpApi\RoutingBundle\Tests\DependencyInjection;
 
 use KleijnWeb\PhpApi\RoutingBundle\DependencyInjection\PhpApiRoutingExtension;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-class ExtensionTest extends \PHPUnit_Framework_TestCase
+class ExtensionTest extends TestCase
 {
     /**
      * @var PhpApiRoutingExtension
@@ -23,23 +24,17 @@ protected function setUp()
         $this->extension = new PhpApiRoutingExtension();
     }
 
-    /**
-     * @test
-     */
-    public function hasRouteLoaderTag()
+    public function testHasRouteLoaderTag()
     {
         $container = new ContainerBuilder();
         $this->extension->load([], $container);
-        $this->assertTrue($container->hasDefinition('openapi.route_loader'));
+        self::assertTrue($container->hasDefinition('openapi.route_loader'));
         $routeLoader = $container->getDefinition('openapi.route_loader');
-        $this->assertSame([[]], $routeLoader->getTag('routing.loader'));
+        self::assertSame([[]], $routeLoader->getTag('routing.loader'));
     }
 
-    /**
-     * @test
-     */
-    public function hasAlias()
+    public function testHasAlias()
     {
-        $this->assertSame('api_routing', $this->extension->getAlias());
+        self::assertSame('api_routing', $this->extension->getAlias());
     }
-}
+}