mirzaev/minimal
1
1
Fork 1
Code Issues 12 Pull Requests Packages Projects 2 Releases Wiki Activity

variables fix with Ksenia

Browse Source
This commit is contained in:
Arsen Mirzaev Tatyano-Muradovich
2025-10-25 14:39:20 +03:00
parent 234691f011
commit e604d19eb1
2 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mirzaev/minimal/system/core.php
View File

@@ -6,23 +6,23 @@ namespace mirzaev\minimal;
// Files of the project // Files of the project
use mirzaev\minimal\router, use mirzaev\minimal\router,
mirzaev\minimal\route, mirzaev\minimal\route,
mirzaev\minimal\controller, mirzaev\minimal\controller,
mirzaev\minimal\model, mirzaev\minimal\model,
mirzaev\minimal\http\request, mirzaev\minimal\http\request,
mirzaev\minimal\http\response, mirzaev\minimal\http\response,
mirzaev\minimal\http\enumerations\status; mirzaev\minimal\http\enumerations\status;
// Built-in libraries // Built-in libraries
use Closure as closure, use Closure as closure,
Exception as exception, Exception as exception,
RuntimeException as exception_runtime, RuntimeException as exception_runtime,
BadMethodCallException as exception_method, BadMethodCallException as exception_method,
DomainException as exception_domain, DomainException as exception_domain,
InvalidArgumentException as exception_argument, InvalidArgumentException as exception_argument,
UnexpectedValueException as exception_value, UnexpectedValueException as exception_value,
LogicException as exception_logic, LogicException as exception_logic,
ReflectionClass as reflection; ReflectionClass as reflection;
/** /**
* Core * Core
@@ -103,7 +103,9 @@ final class core
/** /**
* Destructor * Destructor
*/ */
public function __destruct() {} public function __destruct()
{
}
/** /**
* Start * Start
@@ -128,7 +130,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 +159,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 +253,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

14
mirzaev/minimal/system/route.php
View File

@@ -72,7 +72,7 @@ final class route
// Read // Read
&get => $this->parameters; &get => $this->parameters;
} }
/** /**
* Options * Options
* *
@@ -113,6 +113,18 @@ final class route
// Read // Read
get => $this->options ?? []; 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 * Constructor