Compare commits
	
		
			1 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| b61599aac9 | 
@@ -103,9 +103,7 @@ final class core
 | 
			
		||||
	/**
 | 
			
		||||
	 * Destructor
 | 
			
		||||
	 */
 | 
			
		||||
	public function __destruct()
 | 
			
		||||
	{
 | 
			
		||||
	}
 | 
			
		||||
	public function __destruct() {}
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
	 * Start
 | 
			
		||||
@@ -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;
 | 
			
		||||
@@ -258,7 +256,7 @@ final class core
 | 
			
		||||
					$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
 | 
			
		||||
 
 | 
			
		||||
@@ -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);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
	 *
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user