tracer
/
addressbook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated some comments

This commit is contained in:
tracer 2022-10-24 20:42:26 +02:00
parent fddc58fb14
commit 0ed667d594
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Service/Router.php
View File

@ -45,6 +45,7 @@ class Router
// create regex for route: // create regex for route:
$regex = preg_replace(pattern: '/{.+?}/', replacement: '([a-zA-Z0-9]*)', subject: $route); $regex = preg_replace(pattern: '/{.+?}/', replacement: '([a-zA-Z0-9]*)', subject: $route);
// escape \ in regex
$regex = '/^' . str_replace(search: "/", replace: '\\/', subject: $regex) . '$/i'; $regex = '/^' . str_replace(search: "/", replace: '\\/', subject: $regex) . '$/i';
$route = new Route(name: $name, route: $route, regEx: $regex, parameters: $parameters, callback: $callback); $route = new Route(name: $name, route: $route, regEx: $regex, parameters: $parameters, callback: $callback);
@ -64,7 +65,7 @@ class Router
$requestUri = $_SERVER['REQUEST_URI']; $requestUri = $_SERVER['REQUEST_URI'];
/* /*
* Static routes have preference over dynamic ones, so * Static routes have precedence over dynamic ones, so
* /admin/user/add to add and * /admin/user/add to add and
* /admin/user/{name} to edit is possible. * /admin/user/{name} to edit is possible.
* A user named "add" of course not :) * A user named "add" of course not :)
@ -82,6 +83,8 @@ class Router
} }
foreach ($this->dynamicRoutes as $route) { foreach ($this->dynamicRoutes as $route) {
// PHPStorm doesn't know that $parameters are always available,
// (as it is a dynamic route) so the init the array just to mke PHPstorm happy.
$parameters = []; $parameters = [];
if (preg_match(pattern: $route->getRegex(), subject: $requestUri, matches: $matches)) { if (preg_match(pattern: $route->getRegex(), subject: $requestUri, matches: $matches)) {
foreach ($route->getParameters() as $id => $parameter) { foreach ($route->getParameters() as $id => $parameter) {