replace request target with path

Author: dominikzogg

src/RouteMatcher.php

@@ -32,16 +32,15 @@ public function __construct(RoutesByNameInterface $routes, ?string $cacheFile =
     public function match(ServerRequestInterface $request): RouteInterface
     {
         $method = $request->getMethod();
-        $path = rawurldecode($request->getUri()->getPath());
+        $path = $request->getUri()->getPath();
 
-        $routeInfo = $this->dispatcher->dispatch($method, $path);
+        $routeInfo = $this->dispatcher->dispatch($method, rawurldecode($path));
 
         if (Dispatcher::NOT_FOUND === $routeInfo[0]) {
             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
                 ),
             ]);
         }
@@ -51,7 +50,7 @@ public function match(ServerRequestInterface $request): RouteInterface
                 'detail' => \sprintf(
                     'Method "%s" at path "%s" is not allowed. Must be one of: "%s"',
                     $method,
-                    $request->getRequestTarget(),
+                    $path,
                     implode('", "', $routeInfo[1]),
                 ),
             ]);

tests/Integration/RouteMatcherTest.php

@@ -95,7 +95,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/RouteMatcherTest.php

@@ -85,7 +85,6 @@ public function testMatchNotFound(): void
         $request = $builder->create(ServerRequestInterface::class, [
             new WithReturn('getMethod', [], 'GET'),
             new WithReturn('getUri', [], $uri),
-            new WithReturn('getRequestTarget', [], '/'),
         ]);
 
         /** @var RouteInterface $route */
@@ -112,7 +111,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());
         }
@@ -131,7 +130,6 @@ public function testMatchMethodNotAllowed(): void
         $request = $builder->create(ServerRequestInterface::class, [
             new WithReturn('getMethod', [], 'POST'),
             new WithReturn('getUri', [], $uri),
-            new WithReturn('getRequestTarget', [], '/api/pets?offset=1&limit=20'),
         ]);
 
         /** @var RouteInterface $route */
@@ -158,7 +156,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());
         }
@@ -177,7 +175,6 @@ public function testMatchWithTokensNotMatch(): void
         $request = $builder->create(ServerRequestInterface::class, [
             new WithReturn('getMethod', [], 'GET'),
             new WithReturn('getUri', [], $uri),
-            new WithReturn('getRequestTarget', [], '/api/pets/1'),
         ]);
 
         /** @var RouteInterface $route */
@@ -204,7 +201,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());
         }