replace request target with path

Author: dominikzogg

src/Router.php

@@ -61,22 +61,23 @@ public function match(ServerRequestInterface $request): RouteInterface
     {
         $this->urlMatcher->setContext($this->getRequestContext($request));
 
+        $path = $request->getUri()->getPath();
+
         try {
-            $parameters = $this->urlMatcher->match($request->getUri()->getPath());
+            $parameters = $this->urlMatcher->match($path);
         } catch (SymfonyResourceNotFoundException) {
             throw HttpException::createNotFound([
                 'detail' => \sprintf(
-                    'The page "%s" you are looking for could not be found.'
-                    .' Check the address bar to ensure your URL is spelled correctly.',
-                    $request->getRequestTarget()
+                    'The path "%s" you are looking for could not be found.',
+                    $path
                 ),
             ]);
         } catch (SymfonyMethodNotAllowedException $exception) {
             throw HttpException::createMethodNotAllowed([
                 'detail' => \sprintf(
                     'Method "%s" at path "%s" is not allowed. Must be one of: "%s"',
                     $request->getMethod(),
-                    $request->getRequestTarget(),
+                    $path,
                     implode('", "', $exception->getAllowedMethods()),
                 ),
             ]);

tests/Integration/RouterTest.php

@@ -94,7 +94,7 @@ static function (ServerRequestInterface $request) use ($responseFactory) {
 
         self::assertSame(404, $response->getStatusCode());
         self::assertStringContainsString(
-            'The page "/hello" you are looking for could not be found.',
+            'The path "/hello" you are looking for could not be found.',
             (string) $response->getBody()
         );
     }

tests/Unit/RouterTest.php

@@ -97,7 +97,6 @@ public function testMatchNotFound(): void
             new WithReturn('getUri', [], $uri),
             new WithReturn('getMethod', [], 'GET'),
             new WithReturn('getUri', [], $uri),
-            new WithReturn('getRequestTarget', [], '/'),
         ]);
 
         /** @var RouteInterface $route */
@@ -121,7 +120,7 @@ public function testMatchNotFound(): void
                 'type' => 'https://datatracker.ietf.org/doc/html/rfc2616#section-10.4.5',
                 'status' => 404,
                 'title' => 'Not Found',
-                'detail' => 'The page "/" you are looking for could not be found. Check the address bar to ensure your URL is spelled correctly.',
+                'detail' => 'The path "/" you are looking for could not be found.',
                 'instance' => null,
             ], $e->jsonSerialize());
         }
@@ -147,7 +146,6 @@ public function testMatchMethodNotAllowed(): void
             new WithReturn('getMethod', [], 'POST'),
             new WithReturn('getUri', [], $uri),
             new WithReturn('getMethod', [], 'POST'),
-            new WithReturn('getRequestTarget', [], '/api/pets?offset=1&limit=20'),
         ]);
 
         /** @var RouteInterface $route */
@@ -171,7 +169,7 @@ public function testMatchMethodNotAllowed(): void
                 'type' => 'https://datatracker.ietf.org/doc/html/rfc2616#section-10.4.6',
                 'status' => 405,
                 'title' => 'Method Not Allowed',
-                'detail' => 'Method "POST" at path "/api/pets?offset=1&limit=20" is not allowed. Must be one of: "GET"',
+                'detail' => 'Method "POST" at path "/api/pets" is not allowed. Must be one of: "GET"',
                 'instance' => null,
             ], $e->jsonSerialize());
         }
@@ -234,7 +232,6 @@ public function testMatchWithTokensNotMatch(): void
             new WithReturn('getUri', [], $uri),
             new WithReturn('getMethod', [], 'GET'),
             new WithReturn('getUri', [], $uri),
-            new WithReturn('getRequestTarget', [], '/api/pets/1'),
         ]);
 
         /** @var RouteInterface $route */
@@ -258,7 +255,7 @@ public function testMatchWithTokensNotMatch(): void
                 'type' => 'https://datatracker.ietf.org/doc/html/rfc2616#section-10.4.5',
                 'status' => 404,
                 'title' => 'Not Found',
-                'detail' => 'The page "/api/pets/1" you are looking for could not be found. Check the address bar to ensure your URL is spelled correctly.',
+                'detail' => 'The path "/api/pets/1" you are looking for could not be found.',
                 'instance' => null,
             ], $e->jsonSerialize());
         }
@@ -319,7 +316,6 @@ public function testHostMatchNotFound(): void
             new WithReturn('getUri', [], $uri),
             new WithReturn('getMethod', [], 'GET'),
             new WithReturn('getUri', [], $uri),
-            new WithReturn('getRequestTarget', [], '/api/pets'),
         ]);
 
         /** @var RouteInterface $route */
@@ -343,7 +339,7 @@ public function testHostMatchNotFound(): void
                 'type' => 'https://datatracker.ietf.org/doc/html/rfc2616#section-10.4.5',
                 'status' => 404,
                 'title' => 'Not Found',
-                'detail' => 'The page "/api/pets" you are looking for could not be found. Check the address bar to ensure your URL is spelled correctly.',
+                'detail' => 'The path "/api/pets" you are looking for could not be found.',
                 'instance' => null,
             ], $e->jsonSerialize());
         }
@@ -404,7 +400,6 @@ public function testSchemeMatchNotFound(): void
             new WithReturn('getUri', [], $uri),
             new WithReturn('getMethod', [], 'GET'),
             new WithReturn('getUri', [], $uri),
-            new WithReturn('getRequestTarget', [], '/api/pets?key=value'),
         ]);
 
         /** @var RouteInterface $route */
@@ -428,7 +423,7 @@ public function testSchemeMatchNotFound(): void
                 'type' => 'https://datatracker.ietf.org/doc/html/rfc2616#section-10.4.5',
                 'status' => 404,
                 'title' => 'Not Found',
-                'detail' => 'The page "/api/pets?key=value" you are looking for could not be found. Check the address bar to ensure your URL is spelled correctly.',
+                'detail' => 'The path "/api/pets" you are looking for could not be found.',
                 'instance' => null,
             ], $e->jsonSerialize());
         }
@@ -491,7 +486,6 @@ public function testConditionMatchNotFound(): void
             new WithReturn('getUri', [], $uri),
             new WithReturn('getMethod', [], 'GET'),
             new WithReturn('getUri', [], $uri),
-            new WithReturn('getRequestTarget', [], '/api/pets?key=value'),
         ]);
 
         /** @var RouteInterface $route */
@@ -515,7 +509,7 @@ public function testConditionMatchNotFound(): void
                 'type' => 'https://datatracker.ietf.org/doc/html/rfc2616#section-10.4.5',
                 'status' => 404,
                 'title' => 'Not Found',
-                'detail' => 'The page "/api/pets?key=value" you are looking for could not be found. Check the address bar to ensure your URL is spelled correctly.',
+                'detail' => 'The path "/api/pets" you are looking for could not be found.',
                 'instance' => null,
             ], $e->jsonSerialize());
         }