PHP/Router
PHP/Router
2
0
Fork 1
Code Issues Pull Requests 1 Packages Activity

Tweaks and optimizations #2

Open
valithor wants to merge 6 commits from valithor/dev:master into master
pull from: valithor/dev:master
merge into: PHP:master
Conversation 0 Commits 6 Files Changed 5 +25 -23
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 34b4e4ca20 - Show all commits

40
src/SegmentRouter.php
View File

@ -70,9 +70,6 @@ class SegmentRouter implements RouterInterface
// node is a reference to our current location in the node tree // node is a reference to our current location in the node tree
$node = $this->routes; $node = $this->routes;
// params will hold any dynamic segments we find
$params = [];
// if the URI is just a slash, we can return the handler for the root node // if the URI is just a slash, we can return the handler for the root node
if ($uri === '/') { if ($uri === '/') {
return isset($node[$method]) return isset($node[$method])
@ -80,29 +77,34 @@ class SegmentRouter implements RouterInterface
: ['code' => 405, 'handler' => null, 'params' => null]; : ['code' => 405, 'handler' => null, 'params' => null];
} }
// We'll split up the URI into segments and traverse the node tree // params will hold any dynamic segments we find
foreach (explode('/', trim($uri, '/')) as $segment) { $params = array_reduce(
// if there is a node for this segment, move to it explode('/', trim($uri, '/')),
function ($carry, $segment) use (&$node) {
if (isset($node[$segment])) { if (isset($node[$segment])) {
$node = $node[$segment]; $node = $node[$segment];
continue; } elseif (isset($node[':x'])) {
} $carry[] = $segment;
// if there is a dynamic segment, move to it and store the value
if (isset($node[':x'])) {
$params[] = $segment;
$node = $node[':x']; $node = $node[':x'];
continue; } else {
} throw new \Exception('404');
// if we can't find a node for this segment, return 404
return ['code' => 404, 'handler' => null, 'params' => []];
} }
return $carry;
},
[]
);
// if we found a handler for the method, return it and any params. if not, return a 405 // if we found a handler for the method, return it and any params. if not, return a 405
return isset($node[$method]) return isset($node[$method])
? ['code' => 200, 'handler' => $node[$method], 'params' => $params ?? []] ? [
: ['code' => 405, 'handler' => null, 'params' => []]; 'code' => 200,
'handler' => $node[$method],
'params' => $params ?? []]
: [
'code' => 405,
'handler' => null,
'params' => []
];
} }
/** /**