Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-06-07 13:24:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow [] in character name (for :string)

Browse Source
This commit is contained in:
slawkens 2025-06-03 16:39:02 +02:00
parent c61747dc75
commit 064b929841
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
system/router.php
View File

@ -129,14 +129,14 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
return ($a[3] < $b[3]) ? -1 : 1; return ($a[3] < $b[3]) ? -1 : 1;
}); });
$aliases = [
[':int', ':string', ':alphanum'],
[':\d+', ':[A-Za-z0-9-_%+\' \[\]]+', ':[A-Za-z0-9]+'],
];
// remove duplicates // remove duplicates
// if same route pattern, but different priority // if same route pattern, but different priority
$routesFinal = array_filter($routesFinal, function ($a) { $routesFinal = array_filter($routesFinal, function ($a) use ($aliases) {
$aliases = [
[':int', ':string', ':alphanum'],
[':\d+', ':[A-Za-z0-9-_%+\' ]+', ':[A-Za-z0-9]+'],
];
// apply aliases // apply aliases
$a[1] = str_replace($aliases[0], $aliases[1], $a[1]); $a[1] = str_replace($aliases[0], $aliases[1], $a[1]);
@ -171,11 +171,6 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
$route[0] = array_map($toUpperCase, $route[0]); $route[0] = array_map($toUpperCase, $route[0]);
} }
$aliases = [
[':int', ':string', ':alphanum'],
[':\d+', ':[A-Za-z0-9-_%+\' ]+', ':[A-Za-z0-9]+'],
];
// apply aliases // apply aliases
$route[1] = str_replace($aliases[0], $aliases[1], $route[1]); $route[1] = str_replace($aliases[0], $aliases[1], $route[1]);