Merge pull request #2514 from soyuka/fix-2298

Alternative fix to #2298

Author: soyuka

src/Bridge/Symfony/Routing/IriConverter.php

@@ -30,7 +30,6 @@
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use ApiPlatform\Core\Util\AttributesExtractor;
 use ApiPlatform\Core\Util\ClassInfoTrait;
-use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\Routing\Exception\ExceptionInterface as RoutingExceptionInterface;
@@ -74,8 +73,6 @@ public function getItemFromIri(string $iri, array $context = [])
             $parameters = $this->router->match($iri);
         } catch (RoutingExceptionInterface $e) {
             throw new InvalidArgumentException(sprintf('No route matches "%s".', $iri), $e->getCode(), $e);
-        } catch (RequestExceptionInterface $e) {
-            throw new InvalidArgumentException(sprintf('No route matches "%s".', $iri), $e->getCode(), $e);
         }
 
         if (!isset($parameters['_api_resource_class'])) {

src/Bridge/Symfony/Routing/Router.php

@@ -14,7 +14,9 @@
 namespace ApiPlatform\Core\Bridge\Symfony\Routing;
 
 use ApiPlatform\Core\Api\UrlGeneratorInterface;
+use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouterInterface;
 
@@ -72,7 +74,12 @@ public function match($pathInfo)
         $pathInfo = str_replace($baseContext->getBaseUrl(), '', $pathInfo);
 
         $request = Request::create($pathInfo, 'GET', [], [], [], ['HTTP_HOST' => $baseContext->getHost()]);
-        $context = (new RequestContext())->fromRequest($request);
+        try {
+            $context = (new RequestContext())->fromRequest($request);
+        } catch (RequestExceptionInterface $e) {
+            throw new RouteNotFoundException('Invalid request context.');
+        }
+
         $context->setPathInfo($pathInfo);
         $context->setScheme($baseContext->getScheme());
         $context->setHost($baseContext->getHost());

tests/Bridge/Symfony/Routing/IriConverterTest.php

@@ -31,7 +31,6 @@
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedDummy;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
-use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\RouterInterface;
 
@@ -99,20 +98,6 @@ public function testGetItemFromIriItemNotFoundException()
         $converter->getItemFromIri('/users/3');
     }
 
-    public function testGetItemFromIriWithDateLooksLikeUrl()
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('No route matches "28-01-2018 10:10".');
-
-        $itemDataProviderProphecy = $this->prophesize(ItemDataProviderInterface::class);
-
-        $routerProphecy = $this->prophesize(RouterInterface::class);
-        $routerProphecy->match('28-01-2018 10:10')->willThrow(new SuspiciousOperationException())->shouldBeCalledTimes(1);
-
-        $converter = $this->getIriConverter($routerProphecy, null, $itemDataProviderProphecy);
-        $converter->getItemFromIri('28-01-2018 10:10');
-    }
-
     public function testGetItemFromIri()
     {
         $item = new \stdClass();

tests/Bridge/Symfony/Routing/RouterTest.php

@@ -16,6 +16,7 @@
 use ApiPlatform\Core\Bridge\Symfony\Routing\Router;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Symfony\Component\Routing\Exception\ExceptionInterface as RoutingExceptionInterface;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouterInterface;
@@ -72,4 +73,17 @@ public function testMatch()
 
         $this->assertEquals(['bar'], $router->match('/app_dev.php/foo'));
     }
+
+    public function testWithinvalidContext()
+    {
+        $this->expectException(RoutingExceptionInterface::class);
+        $this->expectExceptionMessage('Invalid request context.');
+        $context = new RequestContext('/app_dev.php', 'GET', 'localhost', 'https');
+
+        $mockedRouter = $this->prophesize('Symfony\Component\Routing\RouterInterface');
+        $mockedRouter->getContext()->willReturn($context)->shouldBeCalled();
+
+        $router = new Router($mockedRouter->reveal());
+        $router->match('28-01-2018 10:10');
+    }
 }