16 Commits

Author SHA1 Message Date
23d7fc72a9 smartphone detection 2026-04-17 10:58:13 +05:00
38a0af6b86 a litle bit reflection in the router, sorry 2026-04-12 18:02:02 +05:00
17c15b0860 fixed controller arguments fixing 2026-04-09 07:33:44 +05:00
b7eda7a944 controller arguments fixed 2026-04-08 15:03:49 +05:00
1123b75d9e fix magix static::class 2026-03-17 17:43:36 +05:00
6d1f1b79ba magic methods fixed 2026-03-09 09:10:11 +05:00
393f37577d json POST $variables fix 2025-12-02 18:58:04 +03:00
584285b92c fix #b61599aac9 merge 2025-11-04 12:27:54 +03:00
ed2a41a139 suggest mirzaev/files 2025-11-04 02:42:27 +07:00
89c6d0c814 suggest mirzaev/languages and mirzaev/currencies 2025-11-04 02:24:05 +07:00
67a2ea3e1d suggest mirzaev/pot 2025-11-04 02:16:40 +07:00
cd4a7912d0 suggest mirzaev/baza 2025-11-04 02:14:39 +07:00
42774c8830 merge with 3.7.3 2025-11-03 15:05:03 +03:00
b61599aac9 gang banged middlewares 2025-11-03 15:01:26 +03:00
234691f011 mego dibil 2025-10-09 23:03:36 +07:00
69702888d1 middlewares fixed govno 2025-10-09 22:45:06 +07:00
8 changed files with 182 additions and 2382 deletions

1
.gitignore vendored
View File

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

View File

@@ -14,7 +14,7 @@
"name": "Arsen Mirzaev Tatyano-Muradovich",
"email": "arsen@mirzaev.sexy",
"homepage": "https://mirzaev.sexy",
"role": "Programmer"
"role": "Creator"
}
],
"support": {
@@ -22,7 +22,15 @@
"issues": "https://git.svoboda.works/mirzaev/minimal/issues"
},
"require": {
"php": "~8.4"
"php": "~8.4",
"mobiledetect/mobiledetectlib": "^4.8"
},
"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": {

2320
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -22,7 +22,10 @@ use Closure as closure,
InvalidArgumentException as exception_argument,
UnexpectedValueException as exception_value,
LogicException as exception_logic,
ReflectionClass as reflection;
Error as error,
ArgumentCountError as error_argument_count,
ReflectionClass as reflection,
ReflectionMethod as reflection_method;
/**
* Core
@@ -34,7 +37,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
@@ -134,21 +137,8 @@ final class core
$_SERVER['SERVER_PROTOCOL'] = $options['protocol'] ?? 'CLI';
}
// Preparing the route function
$action = fn(): string => (string) $this->request(new request(environment: true));
foreach ($this->router->middlewares as $middleware) {
// Iterating over the router middlewares
// Preparing the middleware function
$action = fn(): string => $middleware(next: $action);
}
// Processing middlewares and the router request function
$response = $action();
// Exit (success)
return $response;
// Processing the request and exit (success)
return $this->request(new request(environment: true));
}
/**
@@ -170,30 +160,14 @@ final class core
// Initialized the route
if (!empty($parameters)) {
// Recaived parameters
// Received parameters
// Merging parameters with the route parameters
$route->parameters = $parameters + $route->parameters;
}
// Writing the request options from the route options
$request->options = $route->options;
// Preparing the route function
$action = fn(): string => (string) $this->route($route, $request);
foreach ($route->middlewares as $middleware) {
// Iterating over the route middlewares
// Preparing the middleware function
$action = fn(): string => $middleware(next: $action);
}
// Processing middlewares and the route functions
$response = $action();
// Exit (success)
return $response;
return $this->route($route, $request);
}
// Exit (fail)
@@ -279,8 +253,55 @@ final class core
// Found the method of the controller
try {
// Executing method of the controller and exit (success)
return $route->controller->{$route->method}(...($route->parameters + $request->parameters));
// Preparing the route function
$action = function () use ($request, $route): string {
// Writing the request options from the route options
$request->options = $route->options;
// Initializing the controller method arguments
$arguments = $route->parameters + $route->variables + $request->parameters;
// Processing the method of the controller and exit (success)
$action = function () use ($route, $request, $arguments): string {
if (array_keys($arguments) === array_column((new reflection_method($route->controller, $route->method))->getParameters(), 'name')) {
// Arguments match the controller method arguments
// Exit (success)
return (string) $route->controller->{$route->method}(...$arguments);
} else {
// Arguments not match the controller method arguments
// Exit (success)
return (string) $route->controller->{$route->method}($arguments);
}
};
foreach ($route->middlewares as $middleware) {
// Iterating over the route middlewares
// Preparing the middleware function
$action = fn(): string => $middleware(next: $action, controller: $route->controller);
}
// Processing middlewares and the route functions
$response = $action();
// Exit (success)
return $response;
};
foreach ($this->router->middlewares as $middleware) {
// Iterating over the router middlewares
// Preparing the middleware function
$action = fn(): string => $middleware(next: $action, controller: $route->controller);
}
// Processing middlewares and the router request function
$response = $action();
// Exit (success)
return $response;
} catch (exception $exception) {
// Catched an exception

View File

@@ -11,6 +11,9 @@ use mirzaev\minimal\http\enumerations\method,
mirzaev\minimal\http\enumerations\content,
mirzaev\minimal\http\response;
// The smartphones detection library
use Detection\MobileDetect as mobile;
// Built-in libraries
use DomainException as exception_domain,
InvalidArgumentException as exception_argument,
@@ -297,6 +300,50 @@ final class request
get => $this->options ?? [];
}
/**
* Smartphone
*
* @see https://docs.mobiledetect.net/home/usage-composer Documentation
*
* @var bool $smartphone The request was sent from a smartphone?
*/
public bool $smartphone {
// Read
get() {
if (!isset($this->{__PROPERTY__})) {
// The property is not initialized
// Writing into the property
$this->{__PROPERTY__} = new mobile()->isMobile();
}
// Exit (success)
return $this->{__PROPERTY__};
}
}
/**
* Tablet
*
* @see https://docs.mobiledetect.net/home/usage-composer Documentation
*
* @var bool $tablet The request was sent from a tablet?
*/
public bool $tablet {
// Read
get() {
if (!isset($this->{__PROPERTY__})) {
// The property is not initialized
// Writing into the property
$this->{__PROPERTY__} = new mobile()->isTablet();
}
// Exit (success)
return $this->{__PROPERTY__};
}
}
/**
* Constructor
*
@@ -408,9 +455,6 @@ final class request
// Exit (false)
throw new exception_argument('Failed to validate JSON from the input buffer', status::unprocessable_content->value);
}
// Writing parameters from environment into the property
$this->parameters = $_POST ?? [];
} else if ($this->method === method::post) {
// POST method

View File

@@ -6,10 +6,13 @@ namespace mirzaev\minimal;
// Files of the project
use mirzaev\minimal\http\request,
mirzaev\minimal\controller,
mirzaev\minimal\route;
// Built-in libraries
use Closure as closure;
use Closure as closure,
LogicException as exception_logic
;
/**
* Middleware
@@ -25,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
@@ -41,23 +44,41 @@ 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);
}
}
}
/**
* Invoke
*
* @param callable $next
* @param controller $controller
*
* @return string Output
*/
public function __invoke(callable $next): string
public function __invoke(callable $next, controller $controller): string
{
// Processing the middleware (entering into recursion)
return (string) ($this->function)(next: $next);
return (string) ($this->function)(next: $next, controller: $controller);
}
}

View File

@@ -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
*

View File

@@ -8,7 +8,8 @@ namespace mirzaev\minimal\traits;
use mirzaev\minimal\http\enumerations\status;
// Built-in libraries
use exception;
use Exception as exception,
DomainException as exception_domain;
/**
* Trait of magical methods
@@ -28,6 +29,8 @@ trait magic
/**
* Write property
*
* @throws exception_domain Not found the proprty
*
* @param string $name Name of the property
* @param mixed $value Value of the property
*
@@ -35,14 +38,24 @@ trait magic
*/
public function __set(string $name, mixed $value = null): void
{
match ($name) {
default => throw new exception('Failed to find property: ' . static::class . "::\$$name", status::not_found->value)
};
if (property_exists(static::static, $name)) {
// Exist the property
// Writing the property
$this->{$name} = $value;
} else {
// Not exist the property
// Exit (fail)
throw new exception_domain('Not found the property: ' . static::class . "::\$$name", status::not_found->value);
}
}
/**
* Read property
*
* @throws exception_domain Not found the property
*
* @param string $name Name of the property
*
* @return mixed Value of the property
@@ -50,7 +63,7 @@ trait magic
public function __get(string $name): mixed
{
return match ($name) {
default => throw new exception('Failed to find property: ' . static::class . "::\$$name", status::not_found->value)
default => throw new exception_domain('Not found the property: ' . static::class . "::\$$name", status::not_found->value)
};
}