use phpunit 6

Author: dbu

.travis.yml

@@ -30,7 +30,7 @@ env:
   global:
     - SYMFONY_DEPRECATIONS_HELPER="/.*each.*/"
     - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
-    - SYMFONY_PHPUNIT_VERSION=5.7
+    - SYMFONY_PHPUNIT_VERSION=6
     - TEST_INSTALLATION=false
 
 matrix:

README.md

@@ -10,7 +10,6 @@
 
 Version/Branch | Travis | Coveralls |
 ------ | ------ | --------- |
-2.1.0   | [![Build Status][travis_stable_badge]][travis_link]     | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link]     |
 master | [![Build Status][travis_unstable_badge]][travis_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |
 
 This package is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/) and licensed
@@ -68,12 +67,9 @@ Thanks to
 
 This package is available under the [MIT license](src/Resources/meta/LICENSE).
 
-[travis_stable_badge]: https://travis-ci.org/symfony-cmf/Routing.svg?branch=2.x
 [travis_unstable_badge]: https://travis-ci.org/symfony-cmf/Routing.svg?branch=master
 
 [travis_link]: https://travis-ci.org/symfony-cmf/Routing
 
-[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/routing/badge.svg?branch=2.x
-[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/routing?branch=2.x
 [coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/routing/badge.svg?branch=master
 [coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/routing?branch=master

composer.json

@@ -21,7 +21,7 @@
         "psr/log": "^1.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.2",
+        "symfony/phpunit-bridge": "^4.2.2",
         "symfony/dependency-injection": "^2.8 || ^3.3 || ^4.0",
         "symfony/config": "^2.8 || ^3.3 || ^4.0",
         "symfony/event-dispatcher": "^2.8 || ^3.3 || ^4.0",

tests/Unit/NestedMatcher/NestedMatcherTest.php

@@ -135,7 +135,7 @@ public function testProviderNoMatch()
 
         $matcher = new NestedMatcher($this->provider, $this->finalMatcher);
 
-        $this->setExpectedException(ResourceNotFoundException::class);
+        $this->expectException(ResourceNotFoundException::class);
         $matcher->matchRequest($request);
     }
 }

tests/Unit/NestedMatcher/UrlMatcherTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\NestedMatcher;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\NestedMatcher\UrlMatcher;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
@@ -23,17 +24,35 @@
 
 class UrlMatcherTest extends TestCase
 {
-    protected $routeDocument;
-
-    protected $routeCompiled;
-
-    protected $matcher;
-
-    protected $context;
-
-    protected $request;
-
-    protected $url = '/foo/bar';
+    /**
+     * @var RouteMock|MockObject
+     */
+    private $routeDocument;
+
+    /**
+     * @var CompiledRoute|MockObject
+     */
+    private $routeCompiled;
+
+    /**
+     * @var UrlMatcher
+     */
+    private $matcher;
+
+    /**
+     * @var RequestContext|MockObject
+     */
+    private $context;
+
+    /**
+     * @var Request
+     */
+    private $request;
+
+    /**
+     * @var string
+     */
+    private $url = '/foo/bar';
 
     public function setUp()
     {

tests/Unit/Routing/ChainRouterTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Routing;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Symfony\Cmf\Component\Routing\ChainRouter;
@@ -35,7 +36,7 @@ class ChainRouterTest extends TestCase
     private $router;
 
     /**
-     * @var RequestContext|\PHPUnit_Framework_MockObject_MockObject
+     * @var RequestContext|MockObject
      */
     private $context;
 
@@ -84,7 +85,7 @@ public function testSortRouters()
     {
         list($low, $medium, $high) = $this->createRouterMocks();
         // We're using a mock here and not $this->router because we need to ensure that the sorting operation is done only once.
-        /** @var $router ChainRouter|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $router ChainRouter|MockObject */
         $router = $this->getMockBuilder(ChainRouter::class)
             ->disableOriginalConstructor()
             ->setMethods(['sortRouters'])
@@ -121,7 +122,7 @@ public function testReSortRouters()
         list($low, $medium, $high) = $this->createRouterMocks();
         $highest = clone $high;
         // We're using a mock here and not $this->router because we need to ensure that the sorting operation is done only once.
-        /** @var $router ChainRouter|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $router ChainRouter|MockObject */
         $router = $this->getMockBuilder(ChainRouter::class)
             ->disableOriginalConstructor()
             ->setMethods(['sortRouters'])
@@ -302,7 +303,7 @@ public function testMatchWithRequestMatchers()
             ->with($this->callback(function (Request $r) use ($url) {
                 return $r->getPathInfo() === $url;
             }))
-            ->will($this->throwException(new \Symfony\Component\Routing\Exception\ResourceNotFoundException()))
+            ->will($this->throwException(new ResourceNotFoundException()))
         ;
         $low
             ->expects($this->once())
@@ -413,7 +414,7 @@ public function testMatchRequestAndNotAllowed()
             ->expects($this->once())
             ->method('match')
             ->with($url)
-            ->will($this->throwException(new \Symfony\Component\Routing\Exception\MethodNotAllowedException([])))
+            ->will($this->throwException(new MethodNotAllowedException([])))
         ;
         $low
             ->expects($this->once())
@@ -428,9 +429,6 @@ public function testMatchRequestAndNotAllowed()
         $this->assertEquals(['test'], $result);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
-     */
     public function testMatchNotFound()
     {
         $url = '/test';
@@ -451,12 +449,10 @@ public function testMatchNotFound()
         $this->router->add($low, 10);
         $this->router->add($high, 100);
 
+        $this->expectException(ResourceNotFoundException::class);
         $this->router->match('/test');
     }
 
-    /**
-     * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
-     */
     public function testMatchRequestNotFound()
     {
         $url = '/test';
@@ -477,14 +473,12 @@ public function testMatchRequestNotFound()
         $this->router->add($low, 10);
         $this->router->add($high, 100);
 
+        $this->expectException(ResourceNotFoundException::class);
         $this->router->matchRequest(Request::create('/test'));
     }
 
     /**
      * Call match on ChainRouter that has RequestMatcher in the chain.
-     *
-     * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
-     * @expectedExceptionMessage None of the routers in the chain matched url '/test'
      */
     public function testMatchWithRequestMatchersNotFound()
     {
@@ -502,13 +496,13 @@ public function testMatchWithRequestMatchersNotFound()
 
         $this->router->add($high, 20);
 
+        $this->expectException(ResourceNotFoundException::class);
+        $this->expectExceptionMessage('None of the routers in the chain matched url \'/test\'');
         $this->router->match($url);
     }
 
     /**
      * If any of the routers throws a not allowed exception and no other matches, we need to see this.
-     *
-     * @expectedException \Symfony\Component\Routing\Exception\MethodNotAllowedException
      */
     public function testMatchMethodNotAllowed()
     {
@@ -530,13 +524,12 @@ public function testMatchMethodNotAllowed()
         $this->router->add($low, 10);
         $this->router->add($high, 100);
 
+        $this->expectException(MethodNotAllowedException::class);
         $this->router->match('/test');
     }
 
     /**
      * If any of the routers throws a not allowed exception and no other matches, we need to see this.
-     *
-     * @expectedException \Symfony\Component\Routing\Exception\MethodNotAllowedException
      */
     public function testMatchRequestMethodNotAllowed()
     {
@@ -558,6 +551,7 @@ public function testMatchRequestMethodNotAllowed()
         $this->router->add($low, 10);
         $this->router->add($high, 100);
 
+        $this->expectException(MethodNotAllowedException::class);
         $this->router->matchRequest(Request::create('/test'));
     }
 
@@ -592,9 +586,6 @@ public function testGenerate()
         $this->assertEquals($url, $result);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Routing\Exception\RouteNotFoundException
-     */
     public function testGenerateNotFound()
     {
         $name = 'test';
@@ -615,13 +606,12 @@ public function testGenerateNotFound()
         $this->router->add($low, 10);
         $this->router->add($high, 100);
 
+        $this->expectException(RouteNotFoundException::class);
         $this->router->generate($name, $parameters);
     }
 
     /**
      * Route is an object but no versatile generator around to do the debug message.
-     *
-     * @expectedException \Symfony\Component\Routing\Exception\RouteNotFoundException
      */
     public function testGenerateObjectNotFound()
     {
@@ -637,13 +627,12 @@ public function testGenerateObjectNotFound()
 
         $this->router->add($defaultRouter, 200);
 
+        $this->expectException(RouteNotFoundException::class);
         $this->router->generate($name, $parameters);
     }
 
     /**
      * A versatile router will generate the debug message.
-     *
-     * @expectedException \Symfony\Component\Routing\Exception\RouteNotFoundException
      */
     public function testGenerateObjectNotFoundVersatile()
     {
@@ -669,6 +658,7 @@ public function testGenerateObjectNotFoundVersatile()
 
         $this->router->add($chainedRouter, 10);
 
+        $this->expectException(RouteNotFoundException::class);
         $this->router->generate($name, $parameters);
     }
 
@@ -754,9 +744,6 @@ public function testRouteCollection()
         $this->assertEquals(['high', 'low'], $names);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Routing\Exception\RouteNotFoundException
-     */
     public function testSupport()
     {
         $router = $this->createMock(VersatileRouter::class);
@@ -774,11 +761,12 @@ public function testSupport()
 
         $this->router->add($router);
 
+        $this->expectException(RouteNotFoundException::class);
         $this->router->generate('foobar');
     }
 
     /**
-     * @return RouterInterface[]|\PHPUnit_Framework_MockObject_MockObject[]
+     * @return RouterInterface[]|MockObject[]
      */
     protected function createRouterMocks()
     {