Compare commits
7 Commits
e604d19eb1
...
3.8.6
| Author | SHA1 | Date | |
|---|---|---|---|
| 584285b92c | |||
| ed2a41a139 | |||
| 89c6d0c814 | |||
| 67a2ea3e1d | |||
| cd4a7912d0 | |||
| 42774c8830 | |||
| b61599aac9 |
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,13 @@
|
||||
"require": {
|
||||
"php": "~8.4"
|
||||
},
|
||||
"suggest": {
|
||||
"mirzaev/baza": "Baza database",
|
||||
"mirzaev/pot": "Template for projects",
|
||||
"mirzaev/files": "Easy working with files",
|
||||
"mirzaev/languages": "Easy languages integration",
|
||||
"mirzaev/currencies": "Easy currencies integration"
|
||||
},
|
||||
"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
@@ -34,7 +34,7 @@ use Closure as closure,
|
||||
* @param model $model An instance of the model
|
||||
* @param router $router An instance of the router
|
||||
*
|
||||
* @mathod void __construct(?string $namespace) Constructor
|
||||
* @method void __construct(?string $namespace) Constructor
|
||||
* @method void __destruct() Destructor
|
||||
* @method string|null start() Initialize request by environment and handle it
|
||||
* @method string|null request(request $request, array $parameters = []) Handle request
|
||||
@@ -157,7 +157,7 @@ final class core
|
||||
// Initialized the route
|
||||
|
||||
if (!empty($parameters)) {
|
||||
// Recaived parameters
|
||||
// Received parameters
|
||||
|
||||
// Merging parameters with the route parameters
|
||||
$route->parameters = $parameters + $route->parameters;
|
||||
@@ -251,12 +251,12 @@ final class core
|
||||
|
||||
try {
|
||||
// Preparing the route function
|
||||
$action = function() use ($request, $route): string {
|
||||
$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 + $request->parameters));
|
||||
$action = fn(): string => (string) $route->controller->{$route->method}(...($route->parameters + $route->variables + $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,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