Skip to content

Refactor Router: compile cache, dead code removal, and standards cleanup #1

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
Jakiboy merged 1 commit into from
Apr 21, 2026
Merged

Refactor Router: compile cache, dead code removal, and standards cleanup #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 27 additions & 27 deletions src/Http/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,13 @@ class Router implements RouterInterface
* @var string $base, Route base path
* @var array $types, Route types
* @var array $names, Named routes
* @var array $cache, Compiled route regex cache
*/
protected $routes = [];
protected $base;
protected $types = [];
protected $names = [];
protected $cache = [];

/**
* @inheritdoc
Expand All @@ -81,12 +83,6 @@ public function getRoutes() : array
*/
public function addRoutes(array $routes) : void
{
if ( !TypeCheck::isArray($routes) && !($routes instanceof \Traversable) ) {
throw new RouterException(
RouterException::notTraversable()
);
}

foreach ($routes as $route) {
if ( TypeCheck::isArray($route) && !empty($route) ) {
Hook::callUserFunctionArray([$this, 'map'], $route);
Expand Down Expand Up @@ -152,7 +148,8 @@ public function getNames() : array
public function clearRoutes() : void
{
$this->routes = [];
$this->names = [];
$this->names = [];
$this->cache = [];
}

/**
Expand Down Expand Up @@ -216,7 +213,7 @@ public function generate(string $name, array $params = []) : string

foreach ($matches as $index => $match) {

list($block, $pre, $type, $param, $optional) = $match;
[$block, $pre, $type, $param, $optional] = $match;

if ( $pre ) {
$block = substr($block, 1);
Expand Down Expand Up @@ -264,23 +261,20 @@ public function match(?string $url = null, ?string $method = null)
$url = substr($url, strlen($this->base));

// Strip query string (?a=b) from request URL
if ( ($strpos = strpos($url, '?')) !== false ) {
$url = substr($url, 0, $strpos);
if ( ($queryPos = strpos($url, '?')) !== false ) {
$url = substr($url, 0, $queryPos);
}

// Get last request URL char
$last = $url ? $url[strlen($url) - 1] : '';

foreach ($this->routes as $handler) {

list($routeMethod, $route, $controller, $name, $permission) = $handler;
[$routeMethod, $route, $controller, $name, $permission] = $handler;

// Normalize route method for comparison
// Normalize route method and check match
$routeMethod = Stringify::uppercase($routeMethod);
$routeMethodMatch = (stripos($routeMethod, $method) !== false) || $routeMethod === '*';

// Method did not match, continue to next route.
if ( !$routeMethodMatch ) {
if ( $routeMethod !== '*' && strpos($routeMethod, $method) === false ) {
continue;
}

Expand Down Expand Up @@ -311,11 +305,11 @@ public function match(?string $url = null, ?string $method = null)
if ( $match ) {

if ( $params ) {
foreach ($params as $key => $value) {
if ( TypeCheck::isInt($key) ) {
unset($params[$key]);
}
}
$params = Arrayify::filter(
$params,
fn($key) => !TypeCheck::isInt($key),
ARRAY_FILTER_USE_KEY
);
}

return [
Expand All @@ -339,11 +333,17 @@ public function match(?string $url = null, ?string $method = null)
*/
protected function compile(string $route) : string
{
if ( isset($this->cache[$route]) ) {
return $this->cache[$route];
}
Comment on lines +336 to +338

$compiled = $route;

if ( Stringify::matchAll(static::REGEX, $route, $matches, 2) ) {

foreach ($matches as $match) {

list($block, $pre, $type, $param, $optional) = $match;
[$block, $pre, $type, $param, $optional] = $match;

if ( isset($this->types[$type]) ) {
$type = $this->types[$type];
Expand All @@ -353,23 +353,23 @@ protected function compile(string $route) : string
$pre = '\.';
}

$optional = $optional !== '' ? '?' : null;
$optional = $optional !== '' ? '?' : '';

// Legacy version of PCRE require the 'P' in (?P<named>)
$pattern = '(?:'
. ($pre !== '' ? $pre : null)
. ($pre !== '' ? $pre : '')
. '('
. ($param !== '' ? "?P<$param>" : null)
. ($param !== '' ? "?P<$param>" : '')
. $type
. ')'
. $optional
. ')'
. $optional;

$route = Stringify::replace($block, $pattern, $route);
$compiled = Stringify::replace($block, $pattern, $compiled);
}
}

return "`^{$route}$`u";
return $this->cache[$route] = "`^{$compiled}$`u";
}
}