Fix PHP 8 router parameter dispatching and lesson slug playback lookup

This commit is contained in:
Hamza-Ayed
2026-08-31 17:45:27 +03:00
parent ccf5f13a09
commit 78b703f625
3 changed files with 39 additions and 9 deletions
+11 -3
View File
@@ -88,6 +88,7 @@ class Router
if ($route['method'] === $method && preg_match($route['pattern'], $path, $matches)) {
// Filter named captures from regex match
$params = array_filter($matches, 'is_string', ARRAY_FILTER_USE_KEY);
$request->setParams($params);
// Run global middleware first
foreach ($this->globalMiddleware as $mw) {
@@ -108,13 +109,20 @@ class Router
if (class_exists($controllerClass)) {
$controller = new $controllerClass();
if (method_exists($controller, $action)) {
// Call action with Request, Response and URI dynamic parameters
call_user_func_array([$controller, $action], array_merge([$request, $response], $params));
$ref = new \ReflectionMethod($controller, $action);
$paramCount = $ref->getNumberOfParameters();
if ($paramCount <= 2) {
$controller->$action($request, $response);
} else {
$args = array_values(array_merge([$request, $response], array_values($params)));
call_user_func_array([$controller, $action], $args);
}
return;
}
}
} elseif (is_callable($handler)) {
call_user_func_array($handler, array_merge([$request, $response], $params));
$args = array_values(array_merge([$request, $response], array_values($params)));
call_user_func_array($handler, $args);
return;
}