Merge 3.4

Author: soyuka

src/Symfony/Routing/Router.php

@@ -14,9 +14,7 @@
 namespace ApiPlatform\Symfony\Routing;
 
 use ApiPlatform\Metadata\UrlGeneratorInterface;
-use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouterInterface;
@@ -75,12 +73,7 @@ public function match(string $pathInfo): array
         }
 
         $request = Request::create($pathInfo, Request::METHOD_GET, [], [], [], ['HTTP_HOST' => $baseContext->getHost()]);
-        try {
-            $context = (new RequestContext())->fromRequest($request);
-        } catch (RequestExceptionInterface) {
-            throw new ResourceNotFoundException('Invalid request context.');
-        }
-
+        $context = (new RequestContext())->fromRequest($request);
         $context->setPathInfo($pathInfo);
         $context->setScheme($baseContext->getScheme());
         $context->setHost($baseContext->getHost());

tests/Symfony/Routing/RouterTest.php

@@ -18,7 +18,6 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Component\Routing\Exception\ExceptionInterface as RoutingExceptionInterface;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouterInterface;
@@ -96,19 +95,6 @@ public function testMatch(): void
         $this->assertEquals(['bar'], $router->match('/app_dev.php/foo'));
     }
 
-    public function testMatchWithInvalidContext(): void
-    {
-        $this->expectException(RoutingExceptionInterface::class);
-        $this->expectExceptionMessage('Invalid request context.');
-        $context = new RequestContext('/app_dev.php', 'GET', 'localhost', 'https');
-
-        $mockedRouter = $this->prophesize(RouterInterface::class);
-        $mockedRouter->getContext()->willReturn($context)->shouldBeCalled();
-
-        $router = new Router($mockedRouter->reveal());
-        $router->match('28-01-2018 10:10');
-    }
-
     public function testMatchDuplicatedBaseUrl(): void
     {
         $context = new RequestContext('/app', 'GET', 'localhost', 'https');