variables fix with Ksenia
This commit is contained in:
@@ -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
|
||||
@@ -157,7 +159,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 +253,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
|
||||
|
||||
@@ -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