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

feat: trailing wildcards
utopia-php · Jun 2, 2023 · 9b6171e · 9b6171e
2 parents bc0144f + 5eed77a
commit 9b6171e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 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,15 +407,17 @@ 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 = '';
+ $expected ??= $path;
 
  switch ($method) {
  case App::REQUEST_METHOD_GET: