gang banged middlewares

mirzaev/minimal/system/core.php

@@ -6,23 +6,23 @@ namespace mirzaev\minimal;
 
 // Files of the project
 use mirzaev\minimal\router,
-mirzaev\minimal\route,
+	mirzaev\minimal\route,
-mirzaev\minimal\controller,
+	mirzaev\minimal\controller,
-mirzaev\minimal\model,
+	mirzaev\minimal\model,
-mirzaev\minimal\http\request,
+	mirzaev\minimal\http\request,
-mirzaev\minimal\http\response,
+	mirzaev\minimal\http\response,
-mirzaev\minimal\http\enumerations\status;
+	mirzaev\minimal\http\enumerations\status;
 
 // Built-in libraries
 use Closure as closure,
-Exception as exception,
+	Exception as exception,
-RuntimeException as exception_runtime,
+	RuntimeException as exception_runtime,
-BadMethodCallException as exception_method,
+	BadMethodCallException as exception_method,
-DomainException as exception_domain,
+	DomainException as exception_domain,
-InvalidArgumentException as exception_argument,
+	InvalidArgumentException as exception_argument,
-UnexpectedValueException as exception_value,
+	UnexpectedValueException as exception_value,
-LogicException as exception_logic,
+	LogicException as exception_logic,
-ReflectionClass as reflection;
+	ReflectionClass as reflection;
 
 /**
  * Core
@@ -103,9 +103,7 @@ final class core
 	/**
 	 * Destructor
 	 */
-	public function __destruct()
+	public function __destruct() {}
-	{
-	}
 
 	/**
 	 * Start
@@ -130,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';
@@ -159,7 +157,7 @@ final class core
 			// Initialized the route
 
 			if (!empty($parameters)) {
-				// Received parameters
+				// Recaived parameters
 
 				// Merging parameters with the route parameters
 				$route->parameters = $parameters + $route->parameters;
@@ -253,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 + $route->variables + $request->parameters));
+					$action = fn(): string => (string) $route->controller->{$route->method}(...($route->parameters + $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)
 	{
-		// Writing the function
+		if (static::class === self::class) {
-		$this->function = $function;
+			// 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);
+			}
+		}
 	}
 
 	/**
@@ -56,9 +76,9 @@ final class middleware
 	 *
 	 * @return string Output
 	 */
-	 public function __invoke(callable $next, controller $controller): string
+	public function __invoke(callable $next, controller $controller): string
-	 {
+	{
-		 // Processing the middleware (entering into recursion)
+		// Processing the middleware (entering into recursion)
-		 return (string) ($this->function)(next: $next, controller: $controller);
+		return (string) ($this->function)(next: $next, controller: $controller);
-	 }
+	}
 }

mirzaev/minimal/system/route.php

@@ -114,18 +114,6 @@ final class route
 		get => $this->options ?? [];
 	}
 
-	/**
-	 * Parameters
-	 *
-	 * @see https://wiki.php.net/rfc/property-hooks (find a table about backed and virtual hooks)
-	 * 
-	 * @var array $parameters Arguments for the $this->method (will be concatenated together with generated request parameters)
-	 */
-	public array $variables = [] {
-		// Read
-		&get => $this->variables;
-	}
-
 	/**
 	 * Constructor
 	 *