esoko/soko-web
esoko/soko-web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request 'unify url handling for routes and redirect' (#5) from feature/unify-url-handling into master
All checks were successful
soko-web/pipeline/head This commit looks good
Details

Browse Source 
Reviewed-on: #5
This commit is contained in:
Bence Pőcze 2023-04-16 20:45:23 +02:00
commit 8df2e64872
Signed by: Gitea
GPG Key ID: 7B89B83EED9AD2C6
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Response/Redirect.php
View File

@ -19,7 +19,7 @@ class Redirect implements IRedirect
if (preg_match('/^http(s)?/', $this->target) === 1) { if (preg_match('/^http(s)?/', $this->target) === 1) {
$link = $this->target; $link = $this->target;
} else { } else {
$link = \Container::$request->getBase() . '/' . $this->target; $link = \Container::$request->getBase() . $this->target;
} }
return $link; return $link;

2
src/Routing/Route.php
View File

@ -53,7 +53,7 @@ class Route
$query = count($queryParams) > 0 ? '?' . http_build_query($queryParams) : ''; $query = count($queryParams) > 0 ? '?' . http_build_query($queryParams) : '';
return implode('/', $link) . $query; return '/' . implode('/', $link) . $query;
} }
public function testAgainst(array $path): ?array public function testAgainst(array $path): ?array

7
src/Routing/RouteCollection.php
View File

@ -41,9 +41,10 @@ class RouteCollection
return $this->routes[$id]; return $this->routes[$id];
} }
public function match(string $method, array $uri): ?array public function match(string $method, string $uri): ?array
{ {
$groupNumber = count($uri); $path = $uri === '/' ? [] : explode('/', ltrim($uri, '/'));
$groupNumber = count($path);
// response to HEAD request with the GET content // response to HEAD request with the GET content
if ($method === 'head') { if ($method === 'head') {
@ -55,7 +56,7 @@ class RouteCollection
} }
foreach ($this->searchTable[$method][$groupNumber] as $route) { foreach ($this->searchTable[$method][$groupNumber] as $route) {
if (($parameters = $route->testAgainst($uri)) !== null) { if (($parameters = $route->testAgainst($path)) !== null) {
return [$route, $parameters]; return [$route, $parameters];
} }
} }