Merge pull request #98 from utopia-php/feat-trailing-wildcards-patch

feat: add trailing wildcards
utopia-php · Jun 2, 2023 · a2fb128 · a2fb128
2 parents feb8941 + a928620
commit a2fb128
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/App.php b/src/App.php
@@ -510,9 +510,12 @@ public function match(Request $request, bool $fresh = false): ?Route
                 continue;
             }
 
-            // Check the paths have the same amount of segments
-            if (\substr_count($routeUrl, '/') !== \substr_count($url, '/')) {
-                continue;
+            // check for trailing wildcard
+            if (!str_ends_with($routeUrl, '/*')) {
+                // Check the paths have the same amount of segments
+                if (\substr_count($routeUrl, '/') !== \substr_count($url, '/')) {
+                    continue;
+                }
             }
 
             \array_shift($this->matches);

diff --git a/tests/AppTest.php b/tests/AppTest.php
@@ -407,14 +407,18 @@ public function providerRouteMatching(): array
             '1 separators' => [App::REQUEST_METHOD_GET, '/a/'],
             '2 separators' => [App::REQUEST_METHOD_GET, '/a/b'],
             '3 separators' => [App::REQUEST_METHOD_GET, '/a/b/c'],
+            'trailing wildcard' => [App::REQUEST_METHOD_GET, '/wildcard/*', '/wildcard/lorem/ipsum'],
+            'trailing wildcard - root' => [App::REQUEST_METHOD_GET, '/wildcard/*', '/wildcard'],
         ];
     }
 
     /**
      * @dataProvider providerRouteMatching
      */
-    public function testCanMatchRoute(string $method, string $path): void
+    public function testCanMatchRoute(string $method, string $path, string $expected = null): void
     {
+        $expected ??= $path;
+
         switch ($method) {
             case App::REQUEST_METHOD_GET:
                 $expected = App::get($path);