Compare commits
	
		
			6 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 67a2ea3e1d | |||
| cd4a7912d0 | |||
| 42774c8830 | |||
| b61599aac9 | |||
| 234691f011 | |||
| 69702888d1 | 
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -1 +1,2 @@
 | 
			
		||||
vendor
 | 
			
		||||
composer.lock
 | 
			
		||||
 
 | 
			
		||||
@@ -14,7 +14,7 @@
 | 
			
		||||
            "name": "Arsen Mirzaev Tatyano-Muradovich",
 | 
			
		||||
            "email": "arsen@mirzaev.sexy",
 | 
			
		||||
            "homepage": "https://mirzaev.sexy",
 | 
			
		||||
            "role": "Programmer"
 | 
			
		||||
            "role": "Creator"
 | 
			
		||||
        }
 | 
			
		||||
    ],
 | 
			
		||||
    "support": {
 | 
			
		||||
@@ -24,6 +24,10 @@
 | 
			
		||||
    "require": {
 | 
			
		||||
        "php": "~8.4"
 | 
			
		||||
    },
 | 
			
		||||
		"suggest": {
 | 
			
		||||
			"mirzaev/baza": "Baza database",
 | 
			
		||||
			"mirzaev/pot": "Template for projects"
 | 
			
		||||
		},
 | 
			
		||||
    "autoload": {
 | 
			
		||||
        "psr-4": {
 | 
			
		||||
            "mirzaev\\minimal\\": "mirzaev/minimal/system"
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2320
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2320
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -134,21 +134,8 @@ final class core
 | 
			
		||||
			$_SERVER['SERVER_PROTOCOL'] = $options['protocol'] ?? 'CLI';
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		// Preparing the route function
 | 
			
		||||
		$action = fn(): string => (string) $this->request(new request(environment: true));
 | 
			
		||||
 | 
			
		||||
		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;
 | 
			
		||||
		// Processing the request and exit (success)
 | 
			
		||||
		return $this->request(new request(environment: true));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
@@ -170,30 +157,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;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			// 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;
 | 
			
		||||
			return $this->route($route, $request);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		// Exit (fail)
 | 
			
		||||
@@ -279,8 +250,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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -6,10 +6,13 @@ namespace mirzaev\minimal;
 | 
			
		||||
 | 
			
		||||
// Files of the project
 | 
			
		||||
use mirzaev\minimal\http\request,
 | 
			
		||||
	mirzaev\minimal\controller,
 | 
			
		||||
	mirzaev\minimal\route;
 | 
			
		||||
 | 
			
		||||
// Built-in libraries
 | 
			
		||||
use Closure as closure;
 | 
			
		||||
use Closure as closure,
 | 
			
		||||
	LogicException as exception_logic
 | 
			
		||||
	;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Middleware
 | 
			
		||||
@@ -25,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
 | 
			
		||||
@@ -41,23 +44,41 @@ 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);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
	 * 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);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user