merge with 3.7.3

mirzaev/minimal/system/core.php

@@ -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

mirzaev/minimal/system/middleware.php

@@ -10,7 +10,9 @@ use mirzaev\minimal\http\request,
 	mirzaev\minimal\route;
 
 // Built-in libraries
-use Closure as closure;
+use Closure as closure,
+	LogicException as exception_logic
+	;
 
 /**
  * Middleware
@@ -26,14 +28,14 @@ use Closure as closure;
  * @license http://www.wtfpl.net/ Do What The Fuck You Want To Public License
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
-final class middleware
+class middleware
 {
 	/**
 	 * Function
 	 * 
-	 * @var closure $function Function
+	 * @var closure|array $function Function
 	 */
-	 public readonly closure $function;
+	public readonly closure|array $function;
 
 	/**
 	 * Constructor
@@ -42,10 +44,28 @@ final class middleware
 	 *
 	 * @return void
 	 */
-	public function __construct(closure $function)
+	public function __construct(?closure $function = null)
 	{
+		if (static::class === self::class) {
+			// The middleware class itself
+
 			// Writing the function
 			$this->function = $function;
+		} else {
+			// The middleware inheriting class 
+
+			if (method_exists($this, 'middleware')) {
+				// Found the method
+
+				// Writing the function
+				$this->function = [$this, 'middleware'];
+			} else {
+				// Not found the method
+
+				// Exit (fail)
+				throw new exception_logic('The middleware method is not initialized', 500);
+			}
+		}
 	}
 
 	/**