3 Commits
3.7.3 ... 3.8.2

5 changed files with 42 additions and 2338 deletions

3
.gitignore vendored
View File

@@ -1 +1,2 @@
vendor vendor
composer.lock

View File

@@ -14,7 +14,7 @@
"name": "Arsen Mirzaev Tatyano-Muradovich", "name": "Arsen Mirzaev Tatyano-Muradovich",
"email": "arsen@mirzaev.sexy", "email": "arsen@mirzaev.sexy",
"homepage": "https://mirzaev.sexy", "homepage": "https://mirzaev.sexy",
"role": "Programmer" "role": "Creator"
} }
], ],
"support": { "support": {
@@ -24,6 +24,9 @@
"require": { "require": {
"php": "~8.4" "php": "~8.4"
}, },
"suggest": {
"mirzaev/baza": "Baza database"
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"mirzaev\\minimal\\": "mirzaev/minimal/system" "mirzaev\\minimal\\": "mirzaev/minimal/system"

2320
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -128,7 +128,7 @@ final class core
$_SERVER["REQUEST_METHOD"] = $options['method'] ?? 'GET'; $_SERVER["REQUEST_METHOD"] = $options['method'] ?? 'GET';
// Writing URI into the environment constant // 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 // Writing verstion of HTTP protocol into the environment constant
$_SERVER['SERVER_PROTOCOL'] = $options['protocol'] ?? 'CLI'; $_SERVER['SERVER_PROTOCOL'] = $options['protocol'] ?? 'CLI';
@@ -157,7 +157,7 @@ final class core
// Initialized the route // Initialized the route
if (!empty($parameters)) { if (!empty($parameters)) {
// Recaived parameters // Received parameters
// Merging parameters with the route parameters // Merging parameters with the route parameters
$route->parameters = $parameters + $route->parameters; $route->parameters = $parameters + $route->parameters;
@@ -251,12 +251,12 @@ final class core
try { try {
// Preparing the route function // Preparing the route function
$action = function() use ($request, $route): string { $action = function () use ($request, $route): string {
// Writing the request options from the route options // Writing the request options from the route options
$request->options = $route->options; $request->options = $route->options;
// Processing the method of the controller and exit (success) // Processing the method of the controller and exit (success)
$action = fn(): string => (string) $route->controller->{$route->method}(...($route->parameters + $request->parameters)); $action = fn(): string => (string) $route->controller->{$route->method}(...($route->parameters + $route->variables + $request->parameters));
foreach ($route->middlewares as $middleware) { foreach ($route->middlewares as $middleware) {
// Iterating over the route middlewares // Iterating over the route middlewares

View File

@@ -10,7 +10,9 @@ use mirzaev\minimal\http\request,
mirzaev\minimal\route; mirzaev\minimal\route;
// Built-in libraries // Built-in libraries
use Closure as closure; use Closure as closure,
LogicException as exception_logic
;
/** /**
* Middleware * Middleware
@@ -26,14 +28,14 @@ use Closure as closure;
* @license http://www.wtfpl.net/ Do What The Fuck You Want To Public License * @license http://www.wtfpl.net/ Do What The Fuck You Want To Public License
* @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy> * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
*/ */
final class middleware class middleware
{ {
/** /**
* Function * Function
* *
* @var closure $function Function * @var closure|array $function Function
*/ */
public readonly closure $function; public readonly closure|array $function;
/** /**
* Constructor * Constructor
@@ -42,10 +44,28 @@ final class middleware
* *
* @return void * @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 * @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);
} }
} }