Compare commits
	
		
			1 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| e604d19eb1 | 
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -10,9 +10,7 @@ use mirzaev\minimal\http\request,
 | 
			
		||||
	mirzaev\minimal\route;
 | 
			
		||||
 | 
			
		||||
// Built-in libraries
 | 
			
		||||
use Closure as closure,
 | 
			
		||||
	LogicException as exception_logic
 | 
			
		||||
	;
 | 
			
		||||
use Closure as closure;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Middleware
 | 
			
		||||
@@ -28,14 +26,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>
 | 
			
		||||
 */
 | 
			
		||||
class middleware
 | 
			
		||||
final class middleware
 | 
			
		||||
{
 | 
			
		||||
	/**
 | 
			
		||||
	 * Function
 | 
			
		||||
	 * 
 | 
			
		||||
	 * @var closure|array $function Function
 | 
			
		||||
	 * @var closure $function Function
 | 
			
		||||
	 */
 | 
			
		||||
	public readonly closure|array $function;
 | 
			
		||||
	 public readonly closure $function;
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
	 * Constructor
 | 
			
		||||
@@ -44,28 +42,10 @@ class middleware
 | 
			
		||||
	 *
 | 
			
		||||
	 * @return void
 | 
			
		||||
	 */
 | 
			
		||||
	public function __construct(?closure $function = null)
 | 
			
		||||
	public function __construct(closure $function)
 | 
			
		||||
	{
 | 
			
		||||
		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);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		// Writing the function
 | 
			
		||||
		$this->function = $function;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
@@ -76,9 +56,9 @@ class middleware
 | 
			
		||||
	 *
 | 
			
		||||
	 * @return string Output
 | 
			
		||||
	 */
 | 
			
		||||
	public function __invoke(callable $next, controller $controller): string
 | 
			
		||||
	{
 | 
			
		||||
		// Processing the middleware (entering into recursion)
 | 
			
		||||
		return (string) ($this->function)(next: $next, controller: $controller);
 | 
			
		||||
	}
 | 
			
		||||
	 public function __invoke(callable $next, controller $controller): string
 | 
			
		||||
	 {
 | 
			
		||||
		 // Processing the middleware (entering into recursion)
 | 
			
		||||
		 return (string) ($this->function)(next: $next, controller: $controller);
 | 
			
		||||
	 }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
	 *
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user