Skip to content

feat: add support for trailing slashes in routes and urls #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christyjacob4 merged 2 commits into from
Jun 3, 2023
Merged

feat: add support for trailing slashes in routes and urls #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d25fe85
feat: add support for trailing slashes in routes and urls
christyjacob4 Jun 3, 2023
0dfd196
feat: add support for trailing slashes in routes and urls
christyjacob4 Jun 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/App.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,14 @@ public function match(Request $request, bool $fresh = false): ?Route
foreach (self::$routes[$method] as $routeUrl => $route) {
/** @var Route $route */

if(str_ends_with($routeUrl, '/') && substr_count($routeUrl, '/') > 1) {
$routeUrl = rtrim($routeUrl, '/');
}

if(str_ends_with($url, '/') && substr_count($url, '/') > 1) {
$url = rtrim($url, '/');
}

// convert urls like '/users/:uid/posts/:pid' to regular expression
$regex = '@'.\preg_replace('@:[^/]+@', '([^/]+)', $routeUrl).'@';

Expand Down
9 changes: 6 additions & 3 deletions tests/AppTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,9 @@ public function providerRouteMatching(): array
return [
'GET request' => [App::REQUEST_METHOD_GET, '/path1'],
'GET request on different route' => [App::REQUEST_METHOD_GET, '/path2'],
'GET request with trailing slash #1' => [App::REQUEST_METHOD_GET, '/path3', '/path3/'],
'GET request with trailing slash #2' => [App::REQUEST_METHOD_GET, '/path3/', '/path3/'],
'GET request with trailing slash #3' => [App::REQUEST_METHOD_GET, '/path3/', '/path3'],
'POST request' => [App::REQUEST_METHOD_POST, '/path1'],
'PUT request' => [App::REQUEST_METHOD_PUT, '/path1'],
'PATCH request' => [App::REQUEST_METHOD_PATCH, '/path1'],
Expand All @@ -415,9 +418,9 @@ public function providerRouteMatching(): array
/**
* @dataProvider providerRouteMatching
*/
public function testCanMatchRoute(string $method, string $path, string $expected = null): void
public function testCanMatchRoute(string $method, string $path, string $url = null): void
{
$expected ??= $path;
$url ??= $path;

switch ($method) {
case App::REQUEST_METHOD_GET:
Expand All @@ -438,7 +441,7 @@ public function testCanMatchRoute(string $method, string $path, string $expected
}

$_SERVER['REQUEST_METHOD'] = $method;
$_SERVER['REQUEST_URI'] = $path;
$_SERVER['REQUEST_URI'] = $url;

$this->assertEquals($expected, $this->app->match(new Request()));
$this->assertEquals($expected, $this->app->getRoute());
Expand Down