variables fix with Ksenia

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\controller,
-	mirzaev\minimal\model,
-	mirzaev\minimal\http\request,
-	mirzaev\minimal\http\response,
-	mirzaev\minimal\http\enumerations\status;
+mirzaev\minimal\route,
+mirzaev\minimal\controller,
+mirzaev\minimal\model,
+mirzaev\minimal\http\request,
+mirzaev\minimal\http\response,
+mirzaev\minimal\http\enumerations\status;
 
 // Built-in libraries
 use Closure as closure,
-	Exception as exception,
-	RuntimeException as exception_runtime,
-	BadMethodCallException as exception_method,
-	DomainException as exception_domain,
-	InvalidArgumentException as exception_argument,
-	UnexpectedValueException as exception_value,
-	LogicException as exception_logic,
-	ReflectionClass as reflection;
+Exception as exception,
+RuntimeException as exception_runtime,
+BadMethodCallException as exception_method,
+DomainException as exception_domain,
+InvalidArgumentException as exception_argument,
+UnexpectedValueException as exception_value,
+LogicException as exception_logic,
+ReflectionClass as reflection;
 
 /**
  * Core
@@ -103,7 +103,9 @@ final class core
 	/**
 	 * Destructor
 	 */
-	public function __destruct() {}
+	public function __destruct()
+	{
+	}
 
 	/**
 	 * Start
@@ -128,7 +130,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,46 +159,14 @@ final class core
 			// Initialized the route
 
 			if (!empty($parameters)) {
-				// Recaived parameters
+				// Received parameters
 
 				// Merging parameters with the route parameters
 				$route->parameters = $parameters + $route->parameters;
 			}
 
-			// Preparing the route function
-			$action = function() use ($request, $route): string {
-				// Writing the request options from the route options
-				$request->options = $route->options;
-
-				// Preparing the route function
-				$action = fn(): string => (string) $this->route($route, $request);
-
-				foreach ($route->middlewares as $middleware) {
-					// Iterating over the route middlewares
-
-					// Preparing the middleware function
-					$action = fn(): string => $middleware(next: $action);
-				}
-
-				// Processing middlewares and the route functions
-				$response = $action();
-
-				// Exit (success)
-				return $response;
-			};
-
-			foreach ($this->router->middlewares as $middleware) {
-				// Iterating over the router middlewares
-
-				// Preparing the middleware function
-				$action = fn(): string => $middleware(next: $action);
-			}
-
-			// Processing middlewares and the router request function
-			$response = $action();
-
 			// Exit (success)
-			return $response;
+			return $this->route($route, $request);
 		}
 
 		// Exit (fail)
@@ -282,8 +252,40 @@ final class core
 			// Found the method of the controller
 
 			try {
-				// Executing method of the controller and exit (success)
-				return $route->controller->{$route->method}(...($route->parameters + $request->parameters));
+				// Preparing the route function
+				$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));
+
+					foreach ($route->middlewares as $middleware) {
+						// Iterating over the route middlewares
+
+						// Preparing the middleware function
+						$action = fn(): string => $middleware(next: $action, controller: $route->controller);
+					}
+
+					// Processing middlewares and the route functions
+					$response = $action();
+
+					// Exit (success)
+					return $response;
+				};
+
+				foreach ($this->router->middlewares as $middleware) {
+					// Iterating over the router middlewares
+
+					// Preparing the middleware function
+					$action = fn(): string => $middleware(next: $action, controller: $route->controller);
+				}
+
+				// Processing middlewares and the router request function
+				$response = $action();
+
+				// Exit (success)
+				return $response;
 			} catch (exception $exception) {
 				// Catched an exception
 

mirzaev/minimal/system/middleware.php

@@ -6,6 +6,7 @@ namespace mirzaev\minimal;
 
 // Files of the project
 use mirzaev\minimal\http\request,
+	mirzaev\minimal\controller,
 	mirzaev\minimal\route;
 
 // Built-in libraries
@@ -51,13 +52,13 @@ final class middleware
 	 * Invoke
 	 *
 	 * @param callable $next
+	 * @param controller $controller
 	 *
 	 * @return string Output
 	 */
-	 public function __invoke(callable $next): string
+	 public function __invoke(callable $next, controller $controller): string
 	 {
 		 // Processing the middleware (entering into recursion)
-		
-		 return (string) ($this->function)(next: $next);
+		 return (string) ($this->function)(next: $next, controller: $controller);
 	 }
 }

mirzaev/minimal/system/route.php

@@ -114,6 +114,18 @@ 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
 	 *