3 Commits
3.6.3 ... 3.7.2

Author SHA1 Message Date
234691f011 mego dibil 2025-10-09 23:03:36 +07:00
69702888d1 middlewares fixed govno 2025-10-09 22:45:06 +07:00
4c7355bc03 resolved #9 2025-10-09 22:20:33 +07:00
9 changed files with 283 additions and 119 deletions

View File

@@ -1,10 +1,8 @@
# MINIMAL # MINIMAL
The best code-to-utility Framework The best code-to-utility framework
## Nearest plans (2025) ## Nearest plans (2025)
1. **Middlewares** technology 1. Routes sorting `router::sort()`
2. Route sorting `router::sort()`
3. Processing routes from within routes (request emulation)
## Installation ## Installation
Execute: `composer require mirzaev/minimal` Execute: `composer require mirzaev/minimal`
@@ -28,21 +26,3 @@ $core->router
// Handling the request // Handling the request
$core->start(); $core->start();
``` ```
## Projects based on MINIMAL
### ebala
**Repository:** https://git.svoboda.works/mirzaev/ebala<br>
**Github mirror:** https://github.com/mature-woman/ebala<br>
*I earned more than a **million rubles** from this project*<br>
*Repositories **may** be closed at the request of the customer*<br>
### Arming
**Repository:** https://git.svoboda.works/weby/arming<br>
**Guthub mirror:** https://github.com/WEBY-GROUP/arming<br>
*Telegram chat-robot marketplace*<br>
### not.chat
**Repository:** https://git.svoboda.works/mirzaev/notchat<br>
**Github mirror:** https://github.com/mature-woman/notchat<br>
*P2P chat project with blockchains and smart stuff*<br>

View File

@@ -1,14 +1,14 @@
{ {
"name": "mirzaev/minimal", "name": "mirzaev/minimal",
"type": "framework", "type": "framework",
"description": "My vision of a good framework", "description": "The best code-to-utility framework",
"keywords": [ "keywords": [
"mvc", "mvc",
"framework", "framework",
"lightweight" "lightweight"
], ],
"license": "WTFPL", "license": "WTFPL",
"homepage": "https://git.mirzaev.sexy/mirzaev/minimal", "homepage": "https://git.svoboda.works/mirzaev/minimal",
"authors": [ "authors": [
{ {
"name": "Arsen Mirzaev Tatyano-Muradovich", "name": "Arsen Mirzaev Tatyano-Muradovich",
@@ -18,8 +18,8 @@
} }
], ],
"support": { "support": {
"docs": "https://git.mirzaev.sexy/mirzaev/minimal/wiki", "docs": "https://git.svoboda.works/mirzaev/minimal/wiki",
"issues": "https://git.mirzaev.sexy/mirzaev/minimal/issues" "issues": "https://git.svoboda.works/mirzaev/minimal/issues"
}, },
"require": { "require": {
"php": "~8.4" "php": "~8.4"

View File

@@ -14,7 +14,8 @@ use mirzaev\minimal\router,
mirzaev\minimal\http\enumerations\status; mirzaev\minimal\http\enumerations\status;
// Built-in libraries // Built-in libraries
use exception, use Closure as closure,
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,
@@ -113,7 +114,27 @@ final class core
*/ */
public function start(): ?string public function start(): ?string
{ {
// Handle request and exit (success) if (php_sapi_name() === 'cli') {
// Processing from CLI
// Initializing options
$options = getopt('', [
'method::',
'uri::',
'protocol::'
]);
// Writing method into the environment constant
$_SERVER["REQUEST_METHOD"] = $options['method'] ?? 'GET';
// Writing URI into the environment constant
$_SERVER['REQUEST_URI'] = $options['uri'] ?? '/';
// Writing verstion of HTTP protocol into the environment constant
$_SERVER['SERVER_PROTOCOL'] = $options['protocol'] ?? 'CLI';
}
// Processing the request and exit (success)
return $this->request(new request(environment: true)); return $this->request(new request(environment: true));
} }
@@ -123,29 +144,26 @@ final class core
* Handle request * Handle request
* *
* @param request $request The request * @param request $request The request
* @paam array $parameters parameters for merging with route parameters * @param array $parameters parameters for merging with route parameters
* *
* @return string|null Response * @return string|null Response
*/ */
public function request(request $request, array $parameters = []): ?string public function request(request $request, array $parameters = []): ?string
{ {
// Matching a route // Matching the route
$route = $this->router->match($request); $route = $this->router->match($request);
if ($route) { if ($route) {
// Initialized a route // Initialized the route
if (!empty($parameters)) { if (!empty($parameters)) {
// Recaived parameters // Recaived parameters
// Merging parameters with route parameters // Merging parameters with the route parameters
$route->parameters = $parameters + $route->parameters; $route->parameters = $parameters + $route->parameters;
} }
// Writing request options from route options // Exit (success)
$request->options = $route->options;
// Handling a route and exit (success)
return $this->route($route, $request); return $this->route($route, $request);
} }
@@ -232,15 +250,46 @@ final class core
// Found the method of the controller // Found the method of the controller
try { try {
// Executing method of the controller and exit (success) // Preparing the route function
return $route->controller->{$route->method}(...($route->parameters + $request->parameters)); $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));
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) { } catch (exception $exception) {
// Catched an exception // Catched an exception
// Exit (fail) // Exit (fail)
throw new exception_runtime('Caught an error while processing the route', status::internal_server_error->value, $exception); throw new exception_runtime('Caught an error while processing the route', status::internal_server_error->value, $exception);
} }
} else { } else {
// Not found the method of the controller // Not found the method of the controller

View File

@@ -21,4 +21,6 @@ enum protocol: string
case http_1_1 = 'HTTP/1.1'; case http_1_1 = 'HTTP/1.1';
case http_1 = 'HTTP/1.0'; case http_1 = 'HTTP/1.0';
case http_0_9 = 'HTTP/0.9'; case http_0_9 = 'HTTP/0.9';
case cli = 'CLI';
} }

View File

@@ -6,16 +6,16 @@ namespace mirzaev\minimal\http;
// Files of the project // Files of the project
use mirzaev\minimal\http\enumerations\method, use mirzaev\minimal\http\enumerations\method,
mirzaev\minimal\http\enumerations\protocol, mirzaev\minimal\http\enumerations\protocol,
mirzaev\minimal\http\enumerations\status, mirzaev\minimal\http\enumerations\status,
mirzaev\minimal\http\enumerations\content, mirzaev\minimal\http\enumerations\content,
mirzaev\minimal\http\response; mirzaev\minimal\http\response;
// Built-in libraries // Built-in libraries
use DomainException as exception_domain, use DomainException as exception_domain,
InvalidArgumentException as exception_argument, InvalidArgumentException as exception_argument,
RuntimeException as exception_runtime, RuntimeException as exception_runtime,
LogicException as exception_logic; LogicException as exception_logic;
/** /**
* Request * Request
@@ -280,16 +280,16 @@ final class request
// Writing // Writing
$this->options = array_filter( $this->options = array_filter(
$value, $value,
fn(string $key) => match ($key) { fn(string $key) => match ($key) {
'post_max_size', 'post_max_size',
'max_input_vars', 'max_input_vars',
'max_multipart_body_parts', 'max_multipart_body_parts',
'max_file_uploads', 'max_file_uploads',
'upload_max_filesize' => true, 'upload_max_filesize' => true,
default => throw new exception_domain("Failed to recognize option: $key", status::internal_server_error->value) default => throw new exception_domain("Failed to recognize option: $key", status::internal_server_error->value)
}, },
ARRAY_FILTER_USE_KEY ARRAY_FILTER_USE_KEY
); );
} }
@@ -335,36 +335,42 @@ final class request
if (isset($protocol)) if (isset($protocol))
$this->protocol = $protocol; $this->protocol = $protocol;
if (isset($headers)) { // Declaring the buffer of headers
// Received headers $buffer = [];
// Declaring the buffer of headers foreach (
$buffer = []; match (true) {
isset($headers) => $headers,
php_sapi_name() !== 'cli' => getallheaders(),
default => []
} as $name => $value
) {
// Iterating over headers
foreach ($headers ?? [] as $name => $value) { // Normalizing name of header (https://www.rfc-editor.org/rfc/rfc7540#section-8.1.2)
// Iterating over headers $name = mb_strtolower($name, 'UTF-8');
// Normalizing name of header (https://www.rfc-editor.org/rfc/rfc7540#section-8.1.2) if (empty($name)) {
$name = mb_strtolower($name, 'UTF-8'); // Not normalized name of header
if (empty($name)) { // Exit (fail)
// Not normalized name of header throw new exception_domain('Failed to normalize name of header', status::internal_server_error->value);
// Exit (fail)
throw new exception_domain('Failed to normalize name of header', status::internal_server_error->value);
}
// Writing into the buffer of headers
$buffer[$name] = $value;
} }
// Writing headers from argument into the property // Writing into the buffer of headers
$this->headers = $buffer; $buffer[$name] = $value;
// Deinitializing the buffer of headers
unset($buffer);
} }
if (!empty($buffer)) {
// Initialized at lease one header
// Writing headers into the property
$this->headers = $buffer;
}
// Deinitializing the buffer of headers
unset($buffer);
// Writing parameters from argument into the property // Writing parameters from argument into the property
if (isset($parameters)) if (isset($parameters))
$this->parameters = $parameters; $this->parameters = $parameters;
@@ -385,36 +391,6 @@ final class request
// Writing verstion of HTTP protocol from environment into the property // Writing verstion of HTTP protocol from environment into the property
$this->protocol ??= $_SERVER['SERVER_PROTOCOL']; $this->protocol ??= $_SERVER['SERVER_PROTOCOL'];
if (!isset($headers)) {
// Received headers
// Declaring the buffer of headers
$buffer = [];
foreach (getallheaders() ?? [] as $name => $value) {
// Iterating over headers
// Normalizing name of header (https://www.rfc-editor.org/rfc/rfc7540#section-8.1.2)
$name = mb_strtolower($name, 'UTF-8');
if (empty($name)) {
// Not normalized name of header
// Exit (fail)
throw new exception_domain('Failed to normalize name of header', status::internal_server_error->value);
}
// Writing into the buffer of headers
$buffer[$name] = $value;
}
// Writing headers from environment into the property
$this->headers = $buffer;
// Deinitializing the buffer of headers
unset($buffer);
}
if (str_starts_with($this->headers['content-type'] ?? '', content::json->value)) { if (str_starts_with($this->headers['content-type'] ?? '', content::json->value)) {
// The body contains "application/json" // The body contains "application/json"

View File

@@ -0,0 +1,64 @@
<?php
declare(strict_types=1);
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;
/**
* Middleware
*
* @see https://en.wikipedia.org/wiki/Middleware Middlewares
*
* @package mirzaev\minimal
*
* @param closure $function Function
*
* @method void __construct(closure $function) Constructor
*
* @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
{
/**
* Function
*
* @var closure $function Function
*/
public readonly closure $function;
/**
* Constructor
*
* @param closure $function Function
*
* @return void
*/
public function __construct(closure $function)
{
// Writing the function
$this->function = $function;
}
/**
* Invoke
*
* @param callable $next
* @param controller $controller
*
* @return string Output
*/
public function __invoke(callable $next, controller $controller): string
{
// Processing the middleware (entering into recursion)
return (string) ($this->function)(next: $next, controller: $controller);
}
}

View File

@@ -4,6 +4,11 @@ declare(strict_types=1);
namespace mirzaev\minimal; namespace mirzaev\minimal;
// Files of the project
use mirzaev\minimal\controller,
mirzaev\minimal\middleware,
mirzaev\minimal\traits\middleware as middleware_trait;
/** /**
* Route * Route
* *
@@ -14,14 +19,18 @@ namespace mirzaev\minimal;
* @param string|model $model Name of the model * @param string|model $model Name of the model
* @param array $parameters Arguments for the $this->method (will be concatenated together with generated request parameters) * @param array $parameters Arguments for the $this->method (will be concatenated together with generated request parameters)
* @param array $options Options for `request_parse_body($options)` * @param array $options Options for `request_parse_body($options)`
* @param array $middlewares Stack of middlewares
* *
* @method void __construct(string|controller $controller, ?string $method, string|model|null $model, array $parameters, array $options) Constructor * @method void __construct(string|controller $controller, ?string $method, string|model|null $model, array $parameters, array $options, array $middlewares) Constructor
* @method self middleware(middleware $middleware) Middleware
* *
* @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 route final class route
{ {
use middleware_trait;
/** /**
* Controller * Controller
* *
@@ -37,7 +46,7 @@ final class route
* *
* @var string $method Name of the method of the method of $this->controller * @var string $method Name of the method of the method of $this->controller
*/ */
public string $method{ public string $method {
// Read // Read
get => $this->method; get => $this->method;
} }
@@ -69,8 +78,8 @@ final class route
* *
* Required if $this->method !== method::post * Required if $this->method !== method::post
* *
* @see https://wiki.php.net/rfc/rfc1867-non-post about request_parse_body() * @see https://wiki.php.net/rfc/rfc1867-non-post About request_parse_body()
* @see https://wiki.php.net/rfc/property-hooks (find a table about backed and virtual hooks) * @see https://wiki.php.net/rfc/property-hooks Hooks (find a table about backed and virtual hooks)
* *
* @throws exception_runtime if reinitialize the property * @throws exception_runtime if reinitialize the property
* *
@@ -78,7 +87,7 @@ final class route
*/ */
public array $options { public array $options {
// Write // Write
set (array $value) { set(array $value) {
if (isset($this->{__PROPERTY__})) { if (isset($this->{__PROPERTY__})) {
// The property is already initialized // The property is already initialized
@@ -113,6 +122,7 @@ final class route
* @param string|model|null $model Name of the model * @param string|model|null $model Name of the model
* @param array $parameters Arguments for the $method (will be concatenated together with generated request parameters) * @param array $parameters Arguments for the $method (will be concatenated together with generated request parameters)
* @param array $options Options for `request_parse_body` (Only for POST method) * @param array $options Options for `request_parse_body` (Only for POST method)
* @param array $middlewares Middlewares stack
* *
* @return void * @return void
*/ */
@@ -121,7 +131,8 @@ final class route
?string $method = 'index', ?string $method = 'index',
string|model|null $model = null, string|model|null $model = null,
array $parameters = [], array $parameters = [],
array $options = [] array $options = [],
array $middlewares = []
) { ) {
// Writing name of the controller // Writing name of the controller
$this->controller = $controller; $this->controller = $controller;
@@ -135,6 +146,32 @@ final class route
// Writing parameters // Writing parameters
$this->parameters = $parameters; $this->parameters = $parameters;
// Declaring the register of the middlewares stack validity
$stack = true;
foreach ($middlewares as $middleware) {
// Iterating over middlewares
if ($middleware instanceof middleware) {
// Initialized the middleware
} else {
// Not initialized the middleware
// Writing the register of the middlewares stack validity
$stack = false;
// Exit (fail)
break;
}
}
if ($stack) {
// The middlewares stack is valid
// Writing the middlewares stack
$this->middlewares = $middlewares;
}
// Writing options // Writing options
if (match ($method) { if (match ($method) {
'GET', 'PUT', 'PATCH', 'DELETE' => true, 'GET', 'PUT', 'PATCH', 'DELETE' => true,

View File

@@ -7,7 +7,8 @@ namespace mirzaev\minimal;
// Files of the project // Files of the project
use mirzaev\minimal\route, use mirzaev\minimal\route,
mirzaev\minimal\http\request, mirzaev\minimal\http\request,
mirzaev\minimal\traits\singleton; mirzaev\minimal\traits\singleton,
mirzaev\minimal\traits\middleware as middleware_trait;
// Build-ing libraries // Build-ing libraries
use InvalidArgumentException as exception_argument; use InvalidArgumentException as exception_argument;
@@ -21,15 +22,17 @@ use InvalidArgumentException as exception_argument;
* *
* @method self write(string $urn, route $route, string|array $method) Write route to registry of routes (fluent interface) * @method self write(string $urn, route $route, string|array $method) Write route to registry of routes (fluent interface)
* @method route|null match(request $request) Match request URI with registry of routes * @method route|null match(request $request) Match request URI with registry of routes
* @method self sort() Sort routes (DEV) * @method self sort() Sort routes (DEVELOPMENT)
* @method string universalize(string $urn) Universalize URN * @method string universalize(string $urn) Universalize URN
* @method self middleware(middleware $middleware) Middleware
* @param array $middlewares Stack of middlewares
* *
* @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 router final class router
{ {
use singleton; use singleton, middleware_trait;
/** /**
* Routes * Routes

View File

@@ -0,0 +1,53 @@
<?php
declare(strict_types=1);
namespace mirzaev\minimal\traits;
// Files of the project
use mirzaev\minimal\middleware as instance;
/**
* Trait of middleware
*
* @see https://en.wikipedia.org/wiki/Middleware Middlewares
*
* @package mirzaev\minimal\traits
*
* @param array $middlewares Stack of middlewares
*
* @method self middleware(middleware $middleware) Middleware
*
* @license http://www.wtfpl.net/ Do What The Fuck You Want To Public License
* @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
*/
trait middleware
{
/**
* Middlewares
*
* @var array $middlewares The middlewares stack
*/
public array $middlewares = [] {
// Read
&get => $this->middlewares;
}
/**
* Middleware
*
* Write the middleware into the middlewares stack
*
* @param instance $middleware The middleware
*
* @return self The instance from which the method was called (fluent interface)
*/
public function middleware(instance $middleware): self
{
// Writing into the middlewares stack
$this->middlewares[] = $middleware;
// Exit (success)
return $this;
}
}