Issue #3491543 by mfb: symfony/http-foundation Follow up issue for isAdminPath validator

(cherry picked from commit c981ed1c)

core/lib/Drupal/Core/Routing/AccessAwareRouter.php

@@ -7,8 +7,10 @@
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Http\Exception\CacheableAccessDeniedHttpException;
 use Drupal\Core\Session\AccountInterface;
+use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RequestContext as SymfonyRequestContext;
 use Symfony\Component\Routing\RouterInterface;
@@ -141,7 +143,13 @@ public function generate($name, $parameters = [], $referenceType = self::ABSOLUT
    *   Thrown when access checking failed.
    */
   public function match($pathinfo): array {
-    return $this->matchRequest(Request::create($pathinfo));
+    try {
+      $request = Request::create($pathinfo);
+    }
+    catch (BadRequestException $e) {
+      throw new ResourceNotFoundException($e->getMessage(), $e->getCode(), $e);
+    }
+    return $this->matchRequest($request);
   }
 
 }

core/lib/Drupal/Core/Routing/Router.php

@@ -3,6 +3,7 @@
 namespace Drupal\Core\Routing;
 
 use Drupal\Core\Path\CurrentPathStack;
+use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
@@ -130,7 +131,12 @@ public function addDeprecatedRouteEnhancer(EnhancerInterface $route_enhancer) {
    * {@inheritdoc}
    */
   public function match($pathinfo): array {
-    $request = Request::create($pathinfo);
+    try {
+      $request = Request::create($pathinfo);
+    }
+    catch (BadRequestException $e) {
+      throw new ResourceNotFoundException($e->getMessage(), $e->getCode(), $e);
+    }
 
     return $this->matchRequest($request);
   }

core/tests/Drupal/Tests/Core/Routing/RouterTest.php

@@ -12,6 +12,7 @@
 use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\Argument;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
@@ -59,6 +60,9 @@ public function testMatchesWithDifferentFitOrder(): void {
     $result = $router->match('/user/login');
 
     $this->assertEquals('user_login', $result['_route']);
+
+    $this->expectException(ResourceNotFoundException::class);
+    $router->match('/user/login ');
   }
 
 }