From 42774c88302ea7131f7e36d6eaa59da82e8fd22d Mon Sep 17 00:00:00 2001 From: Arsen Mirzaev Tatyano-Muradovich Date: Mon, 3 Nov 2025 15:05:03 +0300 Subject: [PATCH] merge with 3.7.3 --- mirzaev/minimal/system/core.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mirzaev/minimal/system/core.php b/mirzaev/minimal/system/core.php index 336ba98..3962529 100755 --- a/mirzaev/minimal/system/core.php +++ b/mirzaev/minimal/system/core.php @@ -128,7 +128,7 @@ final class core $_SERVER["REQUEST_METHOD"] = $options['method'] ?? 'GET'; // Writing URI into the environment constant - $_SERVER['REQUEST_URI'] = $options['uri'] ?? '/'; + $_SERVER['REQUEST_URI'] = $options['uri'] ?? '/'; // Writing verstion of HTTP protocol into the environment constant $_SERVER['SERVER_PROTOCOL'] = $options['protocol'] ?? 'CLI'; @@ -157,7 +157,7 @@ final class core // Initialized the route if (!empty($parameters)) { - // Recaived parameters + // Received parameters // Merging parameters with the route parameters $route->parameters = $parameters + $route->parameters; @@ -251,12 +251,12 @@ final class core try { // Preparing the route function - $action = function() use ($request, $route): string { + $action = function () use ($request, $route): string { // Writing the request options from the route options $request->options = $route->options; // Processing the method of the controller and exit (success) - $action = fn(): string => (string) $route->controller->{$route->method}(...($route->parameters + $request->parameters)); + $action = fn(): string => (string) $route->controller->{$route->method}(...($route->parameters + $route->variables + $request->parameters)); foreach ($route->middlewares as $middleware) { // Iterating over the route middlewares