Merge pull request #267 from symfony-cmf/cleanup-interfaces

The RouterInterface is included in the ChainedRouterInterface

Author: dbu

src/DynamicRouter.php

@@ -27,7 +27,6 @@
 use Symfony\Component\Routing\RequestContextAwareInterface;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\RouterInterface;
 
 /**
  * A flexible router accepting matcher and generator through injection and
@@ -36,7 +35,7 @@
  * @author Larry Garfield
  * @author David Buchmann
  */
-class DynamicRouter implements RouterInterface, RequestMatcherInterface, ChainedRouterInterface
+class DynamicRouter implements RequestMatcherInterface, ChainedRouterInterface
 {
     use RouteEnhancerTrait;
 

src/Event/RouterMatchEvent.php

@@ -30,7 +30,7 @@ public function __construct(Request $request = null)
     }
 
     /**
-     * @return Request | null
+     * @return Request|null
      */
     public function getRequest()
     {

tests/Unit/Routing/ChainRouterTest.php

@@ -476,14 +476,19 @@ public function testMatchRequestNotFound()
     public function testMatchWithRequestMatchersNotFound()
     {
         $url = '/test';
-        $request = Request::create('/test');
+        $expected = Request::create('/test');
+        $expected->server->remove('REQUEST_TIME_FLOAT');
 
         $high = $this->createMock(RequestMatcher::class);
 
         $high
             ->expects($this->once())
             ->method('matchRequest')
-            ->with($request)
+            ->with($this->callback(function (Request $actual) use ($expected): bool {
+                $actual->server->remove('REQUEST_TIME_FLOAT');
+
+                return $actual == $expected;
+            }))
             ->will($this->throwException(new ResourceNotFoundException()))
         ;