fix(http): collision between route and query params for uri generator (#687)

Author: brendt

src/Tempest/Http/src/GenericRouter.php

@@ -19,6 +19,7 @@
 use Tempest\Http\Routing\Matching\RouteMatcher;
 use function Tempest\map;
 use Tempest\Reflection\ClassReflector;
+use function Tempest\Support\str;
 use Tempest\Validation\Exceptions\ValidationException;
 use Tempest\View\View;
 
@@ -125,11 +126,11 @@ public function toUri(array|string $action, ...$params): string
             $uri = $action;
         }
 
+        $uri = str($uri);
         $queryParams = [];
 
-
         foreach ($params as $key => $value) {
-            if (! str_contains($uri, sprintf('{%s', $key))) {
+            if (! $uri->matches(sprintf('/\{%s(\}|:)/', $key))) {
                 $queryParams[$key] = $value;
 
                 continue;
@@ -139,17 +140,19 @@ public function toUri(array|string $action, ...$params): string
                 $value = $value->value;
             }
 
-            $pattern = '#\{' . $key . Route::ROUTE_PARAM_CUSTOM_REGEX . '\}#';
-            $uri = preg_replace($pattern, (string)$value, $uri);
+            $uri = $uri->replaceRegex(
+                '#\{' . $key . Route::ROUTE_PARAM_CUSTOM_REGEX . '\}#',
+                (string)$value
+            );
         }
 
-        $uri = rtrim($this->appConfig->baseUri, '/') . $uri;
+        $uri = $uri->prepend(rtrim($this->appConfig->baseUri, '/'));
 
         if ($queryParams !== []) {
-            return $uri . '?' . http_build_query($queryParams);
+            return $uri->append('?' . http_build_query($queryParams))->toString();
         }
 
-        return $uri;
+        return $uri->toString();
     }
 
     private function createResponse(Response|View $input): Response

tests/Fixtures/Controllers/UriGeneratorController.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Tempest\Fixtures\Controllers;
+
+use Tempest\Http\Get;
+use Tempest\Http\Response;
+use Tempest\Http\Responses\Ok;
+
+final readonly class UriGeneratorController
+{
+    #[Get('/test-with-collision/{idea}')]
+    public function withCollidingNames(string $idea): Response
+    {
+        return new Ok();
+    }
+}

tests/Integration/Route/RouterTest.php

@@ -15,6 +15,7 @@
 use Tests\Tempest\Fixtures\Controllers\EnumForController;
 use Tests\Tempest\Fixtures\Controllers\TestController;
 use Tests\Tempest\Fixtures\Controllers\TestGlobalMiddleware;
+use Tests\Tempest\Fixtures\Controllers\UriGeneratorController;
 use Tests\Tempest\Fixtures\Migrations\CreateAuthorTable;
 use Tests\Tempest\Fixtures\Migrations\CreateBookTable;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Author;
@@ -179,4 +180,12 @@ public function test_generate_uri_with_enum(): void
             uri(ControllerWithEnumBinding::class, input: EnumForController::BAR),
         );
     }
+
+    public function test_uri_with_query_param_that_collides_partially_with_route_param(): void
+    {
+        $this->assertSame(
+            '/test-with-collision/hi?id=1',
+            uri([UriGeneratorController::class, 'withCollidingNames'], id: '1', idea: 'hi')
+        );
+    }
 }