fix postfix private

LICENSE

@@ -1,11 +0,0 @@
-DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-Version 2, December 2004
-
-Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
-Everyone is permitted to copy and distribute verbatim or modified copies of this license document, and changing it is allowed as long as the name is changed.
-
-DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.

README.md

@@ -1,64 +0,0 @@
-The MINIMAL framework that does **not limit your project with its own rules**, has **no dependencies**, implements the **best practices** of popular MVC-frameworks, it **VERY fast** and **optimized** for all the innovations in **PHP 8.2** 🤟
-
-Can be configured to work with **any database** `core::$session` and **any HTML template engine** `$this->view`
-*personally, i prefer **ArangoDB** and **Twig***
-
-## Nearest plans (first half of 2025)
-1. Add **middlewares** technology
-2. Route sorting in the router `router::sort()`
-3. Add trigger routes from within routes
-4. Think about adding asynchronous executions
-5. Write an article describing the principles of the framework
-
-## Installation 
-Execute: `composer require mirzaev/minimal`
-
-## Usage
-*index.php*
-```php
-// Initializing the router
-$router = new router;
-
-// Initializing of routes
-$router
-    ->write('/', 'catalog', 'index', 'GET')
-	->write('/search', 'catalog', 'search', 'POST')
-	->write('/session/connect/telegram', 'session', 'telegram', 'POST')
-	->write('/product/$id', 'catalog', 'product', 'POST')
-	->write('/$categories...', 'catalog', 'index', 'POST'); // Collector (since 0.3.0)
-
-// Initializing the core
-$core = new core(namespace: __NAMESPACE__, router: $router, controller: new controller(false), model: new model(false));
-
-// Handle the request
-echo $core->start();
-```
-
-## Examples of projects based on MINIMAL
-
-### ebala
-**Repository:** https://git.mirzaev.sexy/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>
-
-### huesos 
-**Repository:** https://git.mirzaev.sexy/mirzaev/huesos<br>
-**Guthub mirror:** https://github.com/mature-woman/huesos<br>
-*The basis for developing chat-robots with Web App technology (for example for Telegram)*<br>
-
-### arming_bot 
-**Repository:** https://git.mirzaev.sexy/mirzaev/arming_bot<br>
-**Guthub mirror:** https://github.com/mature-woman/arming_bot<br>
-*Chat-robot based on huesos*<br>
-
-### notchat
-**Repository:** https://git.mirzaev.sexy/mirzaev/notchat<br>
-**Github mirror:** https://github.com/mature-woman/notchat<br>
-*P2P chat project with different blockchains and smart stuff*<br>
-
-### site-repression
-**Link:** https://repression.mirzaev.sexy<br>
-**Repository:** https://git.mirzaev.sexy/mirzaev/site-repression<br>
-**Github mirror:** https://github.com/mature-woman/site-repression<br>
-*A simple site for my article about **political repressions in Russia** and my **kidnapping by Wagner PMC operatives** from my house*<br>

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "mirzaev/minimal",
     "type": "framework",
-    "description": "My vision of a good framework",
+    "description": "Lightweight MVC framework that manages only the basic mechanisms, leaving the development of the programmer and not overloading the project",
     "keywords": [
         "mvc",
         "framework",
@@ -14,7 +14,7 @@
             "name": "Arsen Mirzaev Tatyano-Muradovich",
             "email": "arsen@mirzaev.sexy",
             "homepage": "https://mirzaev.sexy",
-            "role": "Programmer"
+            "role": "Developer"
         }
     ],
     "support": {
@@ -22,11 +22,16 @@
         "issues": "https://git.mirzaev.sexy/mirzaev/minimal/issues"
     },
     "require": {
-        "php": "~8.4"
+        "php": "~8.2"
     },
     "autoload": {
         "psr-4": {
             "mirzaev\\minimal\\": "mirzaev/minimal/system"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "mirzaev\\minimal\\tests\\": "mirzaev/minimal/tests"
+        }
     }
 }

mirzaev/minimal/system/controller.php

@@ -4,83 +4,119 @@ declare(strict_types=1);
 
 namespace mirzaev\minimal;
 
-// Files of the project
+// Файлы проекта
-use mirzaev\minimal\model,
+use mirzaev\minimal\model;
-	mirzaev\minimal\core,
-	mirzaev\minimal\traits\magic;
 
-// Build-in libraries
+// Встроенные библиотеки
 use exception;
 
 /**
- * Controller
+ * Контроллер
- *
- * @var core $core An instance of the core
- * @var model $model An instance of the model connected in the core
- * @var view $view View template engine instance (twig)
- * @var core $core An instance of the core
- * @var core $core An instance of the core
- *
- * @method self __construct(core $core) Constructor
  *
  * @package mirzaev\minimal
- *
- * @license http://www.wtfpl.net/ Do What The Fuck You Want To Public License
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 class controller
 {
-	use magic;
+  /**
+   * Постфикс
+   */
+  public const POSTFIX = '_controller';
 
   /**
-	 * Core
+   * Инстанция модели
-	 *
-	 * @var core $core An instance of the core
    */
-	public core $core {		
+  protected model $model;
-		// Read
+
-		get => $this->core;
+  /**
+   * Инстанция шаблонизатора представления
+   */
+  protected object $view;
+
+  /**
+   * Конструктор
+   */
+  public function __construct()
+  {
   }
 
   /**
-	 * Model
+   * Записать свойство
    *
-	 * @var model $model An instance of the model connected in the core
+   * @param string $name Название
+   * @param mixed $value Значение
+   *
+   * @return void
    */
-	public model $model {
+  public function __set(string $name, mixed $value = null): void
-		// Write
+  {
-		set (model $model) {
+    match ($name) {
-				$this->model ??= $model;
+      'model' => (function () use ($value) {
-		}
+        if ($this->__isset('model')) throw new exception('Запрещено реинициализировать свойство с инстанцией модели ($this->model)', 500);
+        else {
+          // Свойство не инициализировано
 
-		// Read
+          if (is_object($value)) $this->model = $value;
-		get => $this->model;
+          else throw new exception('Свойство $this->model должно хранить инстанцию модели (объект)', 500);
+        }
+      })(),
+      'view' => (function () use ($value) {
+        if ($this->__isset('view')) throw new exception('Запрещено реинициализировать свойство с инстанцией шаблонизатора представления ($this->view)', 500);
+        else {
+          // Свойство не инициализировано
+
+          if (is_object($value)) $this->view = $value;
+          else throw new exception('Свойство $this->view должно хранить инстанцию шаблонизатора представления (объект)', 500);
+        }
+      })(),
+      default => throw new exception("Свойство \"\$$name\" не найдено", 404)
+    };
   }
 
   /**
-	 * View
+   * Прочитать свойство
    *
-	 * @var view $view View template engine instance (twig)
+   * @param string $name Название
+   *
+   * @return mixed Содержимое
    */
-	public object $view {
+  public function __get(string $name): mixed
-		// Write
+  {
-		set (object $view) {
+    return match ($name) {
-				$this->view ??= $view;
+      'model' => $this->model ?? throw new exception("Свойство \"\$model\" не инициализировано", 500),
-		}
+      'view' => $this->view ?? throw new exception("Свойство \"\$view\" не инициализировано", 500),
-
+      default => throw new exception("Свойство \"\$$name\" не обнаружено", 404)
-		// Read
+    };
-		get => $this->view;
   }
 
   /**
-	 * Constructor
+   * Проверить свойство на инициализированность
    *
-	 * @param core $core The instance of the core
+   * @param string $name Название
    * 
-	 * @return self
+   * @return bool Инициализировано свойство?
    */
-	public function __construct(core $core) {
+  public function __isset(string $name): bool
-		// Writing the core into the property
+  {
-		$this->core = $core;
+    return match ($name) {
+      default => isset($this->{$name})
+    };
+  }
+
+  /**
+   * Удалить свойство
+   *
+   * @param string $name Название
+   *
+   * @return void
+   */
+  public function __unset(string $name): void
+  {
+    match ($name) {
+      default => (function () use ($name) {
+        // Удаление
+        unset($this->{$name});
+      })()
+    };
   }
 }

mirzaev/minimal/system/core.php

@@ -4,361 +4,227 @@ declare(strict_types=1);
 
 namespace mirzaev\minimal;
 
-// Files of the project
+// Файлы проекта
 use mirzaev\minimal\router,
-	mirzaev\minimal\route,
   mirzaev\minimal\controller,
   mirzaev\minimal\model;
 
-// Built-in libraries
+// Встроенные библиотеки
 use exception,
-	BadMethodCallException  as exception_method,
-	DomainException as exception_domain,
-	InvalidArgumentException as exception_argument,
-	UnexpectedValueException as exception_value,
   ReflectionClass as reflection;
 
 /**
- * Core
+ * Ядро
- *
- * @param string $namespace Namespace where the core was initialized from
- * @param controller $controller An instance of the controller
- * @param model $model An instance of the model
- * @param router $router An instance of the router
- *
- * @mathod self __construct(?string $namespace) Constructor
- * @method void __destruct() Destructor
- * @method string|null request(?string $uri, ?string $method, array $variabls) Handle the request
- * @method string|null route(route $route, string $method) Handle the route
  *
  * @package mirzaev\minimal
- *
- * @license http://www.wtfpl.net/ Do What The Fuck You Want To Public License
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
+ *
+ * @todo
+ * 1. Добавить __isset() и __unset()
  */
 final class core
 {
   /**
-	 * Namespace
+   * Инстанция соединения с базой данных
-	 *
-	 * @var string $namespace Namespace where the core was initialized from
-	 *
-	 * @see https://www.php-fig.org/psr/psr-4/
    */
-	public string $namespace {
+  private object $db;
-		// Read
-		get => $this->namespace;
-	}
 
   /**
-	 * Controller
+   * Инстанция маршрутизатора
-	 *
-	 * @var controller $controller An instance of the controller
    */
-	private controller $controller {
+  private readonly router $router;
-		// Read
-		get => $this->controller ??= new controller;
-	}
 
   /**
-	 * Model
+   * Инстанция ядра контроллера
-	 *
-	 * @var model $model An instance of the model
    */
-	private model $model {
+  private readonly controller $controller;
-		// Read
-		get => $this->model ??= new model;
-	}
 
   /**
-	 * Router
+   * Инстанция ядра модели
-	 *
-	 * @var router $router An instance of the router
    */
-	public router $router {
+  private readonly model $model;
-		get => $this->router ??= router::initialize();
-	}
 
   /**
-	 * Constrictor
+   * Путь пространства имён (системное)
    *
+   * Используется для поиска файлов по спецификации PSR-4
+   */
+  private readonly string $namespace;
+
+  /**
+   * Конструктор
+   *
+   * @param ?object $db Инстанция соединения с базой данных
+   * @param ?router $router Маршрутизатор
+   * @param ?controller $controller Инстанция ядра контроллера
+   * @param ?model $model Инстанция ядра модели
    * @param ?string $namespace Пространство имён системного ядра
    * 
-	 * @return self The instance of the core
+   * @return self Инстанция ядра
    */
   public function __construct(
+    ?object $db = null,
+    ?router $router = null,
+    ?controller $controller = null,
+    ?model $model = null,
     ?string $namespace = null
   ) {
-		// Writing a namespace to the property
+    // Инициализация свойств
-		$this->namespace = $namespace ?? (new reflection(self::class))->getNamespaceName();
+    if (isset($db)) $this->__set('db', $db);
+    if (isset($router)) $this->__set('router', $router);
+    if (isset($controller)) $this->__set('controller', $controller);
+    if (isset($model)) $this->__set('model', $model);
+    $this->__set('namespace', $namespace ?? (new reflection(self::class))->getNamespaceName());
   }
 
-
   /**
-	 * Destructor
+   * Деструктор
+   *
    */
-	public function __destruct() {}
+  public function __destruct()
-
-	/**
-	 * Request
-	 *
-	 * Handle the request
-	 *
-	 * @param string|null $uri URI of the request (value by default: $_SERVER['REQUEST_URI'])
-	 * @param string|null $method Method of the request (GET, POST, PUT...) (value by default: $_SERVER["REQUEST_METHOD"])
-	 * @paam array $parameters parameters for merging with route parameters 
-	 *
-	 * @return string|null Response 
-	 */
-	public function request(?string $uri = null, ?string $method = null, array $parameters = []): ?string
   {
-		// Matching a route 
-		$route = $this->router->match($uri ??= $_SERVER['REQUEST_URI'] ?? '/', $method ??= $_SERVER["REQUEST_METHOD"]);
-
-		if ($route) {
-			// Initialized the route
-
-			if (!empty($parameters)) {
-				// Recaived parameters
-
-				// Merging parameters with route parameters
-				$route->parameters = $parameters + $route->parameters;
-			}
-
-			// Handling the route and exit (success)
-			return $this->route($route, $method);
-		}
-
-		// Exit (fail)
-		return null;
   }
 
   /**
-	 * Route
+   * Запуск
    *
-	 * Handle the route
+   * @param ?string $uri Маршрут
    *
-	 * @param route $route The route
+   * @return ?string Сгенерированный ответ (HTML, JSON...)
-	 * @param string $method Method of requests (GET, POST, PUT, DELETE, COOKIE...)
-	 *
-	 * @return string|null Response, if generated
    */
-	public function route(route $route, string $method = 'GET'): ?string
+  public function start(string $uri = null): ?string
   {
-		// Initializing name of the controller class
+    // Обработка запроса
-		$controller = $route->controller;
+    return $this->__get('router')->handle($uri, core: $this);
-	
-		if ($route->controller instanceof controller) {
-			// Initialized the controller
-		} else if (class_exists($controller = "$this->namespace\\controllers\\$controller")) {
-			// Found the controller by its name
-
-			// Initializing the controller
-			$route->controller = new $controller(core: $this);
-		} else if (!empty($route->controller)) {
-			// Not found the controller and $route->controller has a value
-
-			// Exit (fail)
-			throw new exception_domain('Failed to found the controller: ' . $route->controller);
-		} else {
-			// Not found the controller and $route->controller is empty
-
-			// Exit (fail)
-			throw new exception_argument('Failed to initialize the controller: ' . $route->controller);
   }
 
-		// Deinitializing name of the controller class
+  /**
-		unset($controller);
+   * Записать свойство
+   *
+   * @param string $name Название
+   * @param mixed $value Содержимое
+   *
+   * @return void
+   */
+  public function __set(string $name, mixed $value = null): void
+  {
+    match ($name) {
+      'db', 'database' => (function () use ($value) {
+        if ($this->__isset('db')) throw new exception('Запрещено реинициализировать инстанцию соединения с базой данных ($this->db)', 500);
+        else {
+          // Свойство ещё не было инициализировано
 
-		// Initializing name if the model class
+          if (is_object($value)) $this->db = $value;
-		$model = $route->model;
+          else throw new exception('Свойство $this->db должно хранить инстанцию соединения с базой данных', 500);
+        }
+      })(),
+      'router' => (function () use ($value) {
+        if ($this->__isset('router')) throw new exception('Запрещено реинициализировать инстанцию маршрутизатора ($this->router)', 500);
+        else {
+          // Свойство ещё не было инициализировано
 
-		if ($route->model instanceof model) {
+          if ($value instanceof router) $this->router = $value;
-			// Initialized the model
+          else throw new exception('Свойство $this->router должно хранить инстанцию маршрутизатора (mirzaev\minimal\router)"', 500);
-		} else if (class_exists($model = "$this->namespace\\models\\$model")) {
+        }
-			// Found the model by its name
+      })(),
+      'controller' => (function () use ($value) {
+        if ($this->__isset('controller')) throw new exception('Запрещено реинициализировать инстанцию ядра контроллеров ($this->controller)', 500);
+        else {
+          // Свойство не инициализировано
 
-			// Initializing the model
+          if ($value instanceof controller) $this->controller = $value;
-			$route->model = new $model;
+          else throw new exception('Свойство $this->controller должно хранить инстанцию ядра контроллеров (mirzaev\minimal\controller)', 500);
-		} else if (!empty($route->model)) {
+        }
-			// Not found the model and $route->model has a value
+      })(),
+      'model' => (function () use ($value) {
+        if ($this->__isset('model')) throw new exception('Запрещено реинициализировать инстанцию ядра моделей ($this->model)', 500);
+        else {
+          // Свойство не инициализировано
 
-			// Exit (fail)
+          if ($value instanceof model) $this->model = $value;
-			throw new exception_domain('Failed to initialize the model: ' . ($route->model ?? $route->controller));
+          else throw new exception('Свойство $this->model должно хранить инстанцию ядра моделей (mirzaev\minimal\model)', 500);
+        }
+      })(),
+      'namespace' => (function () use ($value) {
+        if ($this->__isset('namespace')) throw new exception('Запрещено реинициализировать путь пространства имён ($this->namespace)', 500);
+        else {
+          // Свойство не инициализировано
+
+          if (is_string($value)) $this->namespace = $value;
+          else throw new exception('Свойство $this->namespace должно хранить строку с путём пространства имён', 500);
+        }
+      })(),
+      default => throw new exception("Свойство \"\$$name\" не найдено", 404)
+    };
   }
 
-		// Deinitializing name of the model class
+  /**
-		unset($model);
+   * Прочитать свойство
+   *
+   * Записывает значение по умолчанию, если свойство не инициализировано
+   *
+   * @param string $name Название
+   *
+   * @return mixed Содержимое
+   */
+  public function __get(string $name): mixed
+  {
+    return match ($name) {
+      'db', 'database' => $this->db ?? throw new exception("Свойство \"\$$name\" не инициализировано", 500),
+      'router' => (function () {
+        // Инициализация со значением по умолчанию
+        if (!$this->__isset('router')) $this->__set('router', new router);
 
-		if ($route->model instanceof model) {
+        // Возврат (успех)
-			// Initialized the model
+        return $this->router;
+      })(),
+      'controller' => (function () {
+        // Инициализация со значением по умолчанию
+        if (!$this->__isset('controller')) $this->__set('controller', new controller);
 
-			// Writing the model to the controller
+        // Возврат (успех)
-			$route->controller->model = $route->model;
+        return $this->controller;
+      })(),
+      'model' => (function () {
+        // Инициализация со значением по умолчанию
+        if (!$this->__isset('model')) $this->__set('model', new model);
+
+        // Возврат (успех)
+        return $this->model;
+      })(),
+      'namespace' => $this->namespace ?? throw new exception("Свойство \"\$$name\" не инициализировано", 500),
+      default => throw new exception("Свойство \"\$$name\" не найдено", 404)
+    };
   }
 
-		if ($method === 'POST') {
+  /**
-			// POST
+   * Проверить свойство на инициализированность
-
+   *
-			if (method_exists($route->controller, $route->method)) {
+   * @param string $name Название
-				// Found the method of the controller
+   *
-
+   * @return bool Инициализировано свойство?
-				// Executing method of the controller that handles the route and exit (success)
+   */
-				return $route->controller->{$route->method}($route->parameters + $_POST, $_FILES);
+  public function __isset(string $name): bool
-			} else {
+  {
-				// Not found the method of the controller
+    return match ($name) {
-		
+      default => isset($this->{$name})
-				// Exit (fail)
+    };
-				throw new exception('Failed to find the method of the controller: ' . $route->method);
-			}
-		} else if ($method === 'GET') {
-			// GET
-
-			if (method_exists($route->controller, $route->method)) {
-				// Found the method of the controller
-
-				if ($_SERVER["CONTENT_TYPE"] === 'multipart/form-data' || $_SERVER["CONTENT_TYPE"] === 'application/x-www-form-urlencoded') {
-					// The requeset content type is the "multipart/form-data" or "application/x-www-form-urlencoded"
-
-					// Analysis of the request
-					[$_GET, $_FILES] = request_parse_body($route->options);
   }
 
-				// Executing method of the controller that handles the route and exit (success)
+  /**
-				return $route->controller->{$route->method}($route->parameters + $_GET, $_FILES);
+   * Удалить свойство
-			} else {
+   *
-				// Not found the method of the controller
+   * @param string $name Название
-		
+   *
-				// Exit (fail)
+   * @return void
-				throw new exception('Failed to find the method of the controller: ' . $route->method);
+   */
-			}
+  public function __unset(string $name): void
-		} else if ($method === 'PUT') {
+  {
-			// PUT
+    match ($name) {
-
+      default => (function () use ($name) {
-			if (method_exists($route->controller, $route->method)) {
+        // Удаление
-				// Found the method of the controller
+        unset($this->{$name});
-
+      })()
-				if ($_SERVER["CONTENT_TYPE"] === 'multipart/form-data' || $_SERVER["CONTENT_TYPE"] === 'application/x-www-form-urlencoded') {
+    };
-					// The requeset content type is the "multipart/form-data" or "application/x-www-form-urlencoded"
-
-					// Analysis of the request
-					[$_PUT, $_FILES] = request_parse_body($route->options);
-				}
-
-				// Executing method of the controller that handles the route and exit (success)
-				return $route->controller->{$route->method}($route->parameters + $_PUT, $_FILES);
-			} else {
-				// Not found the method of the controller
-		
-				// Exit (fail)
-				throw new exception('Failed to find the method of the controller: ' . $route->method);
-			}
-		} else if ($method === 'DELETE') {
-			// DELETE
-
-			if (method_exists($route->controller, $route->method)) {
-				// Found the method of the controller
-
-				if ($_SERVER["CONTENT_TYPE"] === 'multipart/form-data' || $_SERVER["CONTENT_TYPE"] === 'application/x-www-form-urlencoded') {
-					// The requeset content type is the "multipart/form-data" or "application/x-www-form-urlencoded"
-
-					// Analysis of the request
-					[$_DELETE, $_FILES] = request_parse_body($route->options);
-				}
-
-				// Executing method of the controller that handles the route and exit (success)
-				return $route->controller->{$route->method}($route->parameters + $_DELETE, $_FILES);
-			} else {
-				// Not found the method of the controller
-		
-				// Exit (fail)
-				throw new exception('Failed to find the method of the controller: ' . $route->method);
-			}
-		} else if ($method === 'PATCH') {
-			// PATCH
-
-			if (method_exists($route->controller, $route->method)) {
-				// Found the method of the controller
-
-				if ($_SERVER["CONTENT_TYPE"] === 'multipart/form-data' || $_SERVER["CONTENT_TYPE"] === 'application/x-www-form-urlencoded') {
-					// The requeset content type is the "multipart/form-data" or "application/x-www-form-urlencoded"
-
-					// Analysis of the request
-					[$_PATCH, $_FILES] = request_parse_body($route->options);
-				}
-
-				// Executing method of the controller that handles the route and exit (success)
-				return $route->controller->{$route->method}($route->parameters + $_PATCH, $_FILES);
-			} else {
-				// Not found the method of the controller
-		
-				// Exit (fail)
-				throw new exception('Failed to find the method of the controller: ' . $route->method);
-			}
-		} else if ($method === 'HEAD') {
-			// HEAD
-
-			if (method_exists($route->controller, $route->method)) {
-				// Found the method of the controller
-
-				// Executing method of the controller that handles the route and exit (success)
-				return $route->controller->{$route->method}($route->parameters);
-			} else {
-				// Not found the method of the controller
-		
-				// Exit (fail)
-				throw new exception('Failed to find the method of the controller: ' . $route->method);
-			}
-		} else if ($method === 'OPTIONS') {
-			// OPTIONS
-
-			if (method_exists($route->controller, $route->method)) {
-				// Found the method of the controller
-
-				// Executing method of the controller that handles the route and exit (success)
-				return $route->controller->{$route->method}($route->parameters);
-			} else {
-				// Not found the method of the controller
-		
-				// Exit (fail)
-				throw new exception('Failed to find the method of the controller: ' . $route->method);
-			}
-		} else if ($method === 'CONNECT') {
-			// CONNECT
-
-			if (method_exists($route->controller, $route->method)) {
-				// Found the method of the controller
-
-				// Executing method of the controller that handles the route and exit (success)
-				return $route->controller->{$route->method}($route->parameters);
-			} else {
-				// Not found the method of the controller
-		
-				// Exit (fail)
-				throw new exception('Failed to find the method of the controller: ' . $route->method);
-			}
-		} else if ($method === 'TRACE') {
-			// TRACE
-
-			if (method_exists($route->controller, $route->method)) {
-				// Found the method of the controller
-
-				// Executing method of the controller that handles the route and exit (success)
-				return $route->controller->{$route->method}($route->parameters);
-			} else {
-				// Not found the method of the controller
-		
-				// Exit (fail)
-				throw new exception('Failed to find the method of the controller: ' . $route->method);
-			}
-		} else {
-			// Not recognized method of the request
-
-			// Exit (fail)
-			throw new exception_value('Failed to recognize the method: ' . $method);
-		}
-
-		// Exit (fail)
-		return null;
   }
 }

mirzaev/minimal/system/model.php

@@ -4,27 +4,86 @@ declare(strict_types=1);
 
 namespace mirzaev\minimal;
 
-// Files of the project
+// Встроенные библиотеки
-use	mirzaev\minimal\traits\magic;
+use exception;
 
 /**
- * Model
+ * Модель
- *
- * @method self __construct() Constructor
  *
  * @package mirzaev\minimal
- *
- * @license http://www.wtfpl.net/ Do What The Fuck You Want To Public License
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 class model
 {
-	use magic;
+  /**
+   * Постфикс
+   */
+  public const POSTFIX = '_model';
 
   /**
-	 * Constructor
+   * Конструктор
-	 *
-	 * @return self
    */
-	public function __construct() {}
+  public function __construct()
+  {
+  }
+
+  /**
+   * Записать свойство
+   *
+   * @param string $name Название
+   * @param mixed $value Содержимое
+   *
+   * @return void
+   */
+  public function __set(string $name, mixed $value = null): void
+  {
+    match ($name) {
+      default => throw new exception("Свойство \"\$$name\" не найдено", 404)
+    };
+  }
+
+  /**
+   * Прочитать свойство
+   *
+   * @param string $name Название
+   *
+   * @return mixed Содержимое
+   */
+  public function __get(string $name): mixed
+  {
+    return match ($name) {
+      default => throw new exception("Свойство \"\$$name\" не обнаружено", 404)
+    };
+  }
+
+  /**
+   * Проверить свойство на инициализированность
+   *
+   * @param string $name Название
+   *
+   * @return bool Инициализировано свойство?
+   */
+  public function __isset(string $name): bool
+  {
+    return match ($name) {
+      default => isset($this->{$name})
+    };
+  }
+
+  /**
+   * Удалить свойство
+   *
+   * @param string $name Название
+   *
+   * @return void
+   */
+  public function __unset(string $name): void
+  {
+    match ($name) {
+      default => (function () use ($name) {
+        // Удаление
+        unset($this->{$name});
+      })()
+    };
+  }
 }

mirzaev/minimal/system/route.php

@@ -1,127 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace mirzaev\minimal;
-
-/**
- * Route
- *
- * @param string|controller $controller Name of the controller
- * @param string $method Name of the method of the method of $this->controller
- * @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 $options Options for `request_parse_body($options)`
- *
- * @method self __construct(string $controller,?string $method, ?string $model, array $variables, array $options) Constructor
- *
- * @package mirzaev\minimal
- *
- * @license http://www.wtfpl.net/ Do What The Fuck You Want To Public License
- * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
- */
-final class route
-{
-	/**
-	 * Controller
-	 * 
-	 * @var string|model $controller Name of the controller or an instance of the controller
-	 */
-	public string|controller $controller {
-		// Read
-		get => $this->controller;
-	}
-
-	/**
-	 * Method
-	 * 
-	 * @var string $method Name of the method of the method of $this->controller
-	 */
-	public string $method{
-		// Read
-		get => $this->method;
-	}
-
-	/**
-	 * Model
-	 * 
-	 * @var string|model|null $model Name of the model of an instance of the model
-	 */
-	public string|model|null $model {
-		// Read
-		get => $this->model;
-	}
-
-	/**
-	 * Parameters
-	 * 
-	 * @var array $parameters Arguments for the $this->method (will be concatenated together with generated request parameters)
-	 */
-	public array $parameters {
-		// Read
-		get => $this->parameters;
-	}
-
-	/**
-	 * Options
-	 *
-	 * Used only for GET, PUT, PATCH and DELETE
-	 * 
-	 * @var string $options Options for `request_parse_body($options)`
-	 */
-	public array $options {
-		// Write
-		set (array $value) => array_filter(
-			$value,
-			fn(string $key) => match ($key) {
-				'post_max_size',
-				'max_input_vars',
-				'max_multipart_body_parts',
-				'max_file_uploads',
-				'upload_max_filesize' => true,
-				default => false
-			},
-			ARRAY_FILTER_USE_KEY
-		);
-
-		// Read
-		get => $this->options;
-	}
-
-	/**
-	 * Constructor
-	 *
-	 * @param string|controller $controller Name of the controller
-	 * @param string|null $method Name of the method of the method of $controller
-	 * @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 $options Options for `request_parse_body` (Only for POST method)
-	 *
-	 * @return self
-	 */
-	public function __construct(
-		string|controller $controller,
-		?string $method = 'index',
-		string|model|null $model = null,
-		array $parameters = [],
-		array $options = []
-	) {
-		// Writing name of the controller
-		$this->controller = $controller;
-
-		// Writing name of the model
-		$this->model = $model;
-
-		// Writing name of the method of the controller
-		$this->method = $method;
-
-		// Writing parameters
-		$this->parameters = $parameters;
-
-		// Writing options
-		if (match ($method) {
-			'GET', 'PUT', 'PATCH', 'DELETE' => true,
-			default => false
-		}) $this->options = $options;
-	}
-}

mirzaev/minimal/system/router.php

@@ -4,282 +4,170 @@ declare(strict_types=1);
 
 namespace mirzaev\minimal;
 
-// Files of the project
+// Файлы проекта
-use mirzaev\minimal\route,
+use mirzaev\minimal\core;
-	mirzaev\minimal\traits\singleton;
-
-// Build-ing libraries
-use InvalidArgumentException as exception_argument;
 
 /**
- * Router
+ * Маршрутизатор
- *
- * @param array $routes The registry of routes
- *
- * @method self write(string $uri, string $method)
- * @method self sort() Sort routes (DEV)
- * @method string universalize(string $urn) Universalize URN
  *
  * @package mirzaev\minimal
- *
- * @license http://www.wtfpl.net/ Do What The Fuck You Want To Public License
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class router
 {
-	use singleton;
-
   /**
-	 * Routes
+   * @var array $router Реестр маршрутов
-	 *
-	 * @var array $routes The registry of routes
    */
   protected array $routes = [];
 
   /**
-	 * Write a route
+   * Записать маршрут
    *
-	 * @param string $urn URN of the route ('/', '/page', '/page/$variable', '/page/$collector...'...)
+   * @param string $route Маршрут
-	 * @param route $route The route
+   * @param string $handler Обработчик - инстанции контроллера и модели (не обязательно), без постфиксов
-	 * @param string|array $method Method of requests (GET, POST, PUT, DELETE, COOKIE...)
+   * @param ?string $method Вызываемый метод в инстанции контроллера обработчика
+   * @param ?string $request HTTP-метод запроса (GET, POST, PUT...)
+   * @param ?string $model Инстанция модели (переопределение инстанции модели в $target)
    *
-	 * @return self The instance from which the method was called (fluent interface)
+   * @return void
    */
   public function write(
-		string $urn,
+    string $route,
-		route $route,
+    string $handler,
-		null|string|array $method = 'GET'
+    ?string $method = 'index',
-	): self {
+    ?string $request = 'GET',
-		foreach (is_array($method) ? $method : [$method] as $method) {
+    ?string $model = null
-			// Iterate over methods of requests
+  ): void {
-
+    // Запись в реестр
-			// Validating method
+    $this->routes[$route][$request] = [
-			$method = match ($method) {
+      'controller' => $handler,
-				'POST', 'GET', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS', 'CONNECT', 'TRACE' => $method,
+      'model' => $model ?? $handler,
-				default => throw new exception_argument("Failed to initialize method: \"$method\"")
+      'method' => $method
-			};
+    ];
-
-			// Writing to the registry of routes
-			$this->routes[$urn][$method] = $route;
-		}
-
-		// Exit (success) (fluent interface)
-		return $this;
   }
 
   /**
-	 * Match
+   * Обработать маршрут
    *
-	 * Match request URI with registry of routes
+   * @param ?string $uri URI запроса (https://domain.com/foo/bar)
-	 *
+   * @param ?string $method Метод запроса (GET, POST, PUT...)
-	 * @param string $uri URI (protocol://domain/foo/bar)
+   * @param ?core $core Инстанция системного ядра
-	 * @param string $method Method of the request (GET, POST, PUT...)
-	 *
-	 * @return route|null Route, if found
    */
-	public function match(string $uri, string $method): ?route {
+  public function handle(?string $uri = null, ?string $method = null, ?core $core = new core): ?string
-		// Declaration of the registry of routes directoies 
+  {
-		$routes = [];
+    // Инициализация значений по умолчанию
+    $uri ??= $_SERVER['REQUEST_URI'] ?? '/';
+    $method ??= $_SERVER["REQUEST_METHOD"] ?? 'GET';
 
-		foreach ($this->routes as $route => $data) {
+    // Инициализация URL запроса (/foo/bar)
-			// Iteration over routes
+    $url = parse_url($uri, PHP_URL_PATH);
 
-			// Search directories of route (explode() creates empty value in array)
+    // Универсализация маршрута
-			preg_match_all('/(^\/$|[^\/]+)/', $route, $data['directories']);
+    $url = self::universalize($url);
-			$routes[$route] = $data['directories'][0];
-		}
 
-		if (count($routes) === count($this->routes)) {
+    // Сортировка реестра маршрутов от большего ключа к меньшему (кешируется)
-			// Initialized the registry of routes directoies
+    krsort($this->routes);
 
-			// Universalization of URN (/foo/bar)
+    // Поиск директорий в ссылке
-			$urn = self::universalize(parse_url(urldecode($uri), PHP_URL_PATH));
+    preg_match_all('/[^\/]+/', $url, $directories);
 
-			// Search directories of URN (explode() creates empty value in array)
+    // Инициализация директорий
-			preg_match_all('/(^\/$|[^\/]+)/', $urn, $directories);
     $directories = $directories[0];
 
-			/**
-			 * Initialization of the route
-			 */
-
-			// Initializing the buffer of matches of route directories with URN directories
-			$matches = [];
-
-			foreach ($directories as $i => $urn_directory) {
-				// Iteration over directories of URN 
-
     foreach ($this->routes as $route => $data) {
-					// Iteration over routes
+      // Перебор маршрутов
 
-					if (isset($data[$method])) {
+      // Универсализация маршрута
-						// The request method matches the route method
-
-						// Universalization of route
       $route = self::universalize($route);
 
-						// Skipping unmatched routes based on results of previous iterations
+      // Поиск директорий
-						if (isset($matches[$route]) && $matches[$route] === false) continue;
+      preg_match_all('/[^\/]+/', $route, $data['directories']);
 
-						// Initializing of route directory
+      // Инициализация директорий
-						$route_directory = $routes[$route][$i] ?? null;
+      $data['directories'] = $data['directories'][0];
 
-						if (isset($route_directory)) {
+      if (count($directories) === count($data['directories'])) {
-							// Initialized of route directory
+        // Входит в диапазон маршрут (совпадает количество директорий у ссылки и маршрута)
 
-							if ($urn_directory === $route_directory) {
+        // Инициализация реестра переменных
-								// The directory of URN is identical to the directory of route
+        $data['vars'] = [];
 
-								// Writing: end of URN directories XNOR end of route directories
+        foreach ($data['directories'] as $index => &$directory) {
-								$matches[$route] = !(isset($directories[$_i = $i + 1]) xor isset($routes[$route][$_i]));
+          // Перебор директорий
-							} else if (preg_match('/^\$([a-zA-Z_\x80-\xff]+)$/', $route_directory) === 1) {
-								// The directory of route is a variable ($variable)
 
-								// Writing: end of URN directories XNOR end of route directories
+          if (preg_match('/\$([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]+)/', $directory) === 1) {
-								$matches[$route] = !(isset($directories[$_i = $i + 1]) xor isset($routes[$route][$_i]));
+            // Директория является переменной (.../$variable/...)
-							} else if (
-								!isset($routes[$route][$i + 1])
-								&& preg_match('/^\$([a-zA-Z_\x80-\xff]+\.\.\.)$/', $route_directory) === 1
-							) {
-								// The directory of route is a collector ($variable...)
-								// AND this is the end of route directories
-
-								// Writing
-								$matches[$route] = 'collector';
-							} else $matches[$route] = false;
-						} else if ($matches[$route] === 'collector') {
-						} else $matches[$route] = false;
-					}
-				}
-			}
-
-			// Finding a priority route from match results
-			foreach ($matches as $route => $match) if ($match !== false) break;
-
-			if ($route && !empty($data = $this->routes[$route])) {
-				// Route found
-
-				// Universalization of route
-				$route = self::universalize($route);
-
-				/**
-				 * Initialization of route variables
-				 */
-
-				foreach ($routes[$route] as $i => $route_directory) {
-					// Iteration over directories of route
-
-					if (preg_match('/^\$([a-zA-Z_\x80-\xff]+)$/', $route_directory) === 1) {
-						// The directory is a variable ($variable)
-
-						// Запись в реестр переменных и перещапись директории в маршруте
-						$data[$method]->variables[trim($route_directory, '$')] = $directories[$i];
-					} else if (preg_match('/^\$([a-zA-Z_\x80-\xff]+\.\.\.)$/', $route_directory) === 1) {
-						// The directory of route is a collector ($variable...)
-
-						// Инициализаия ссылки на массив сборщика
-						$collector = &$data[$method]->variables[trim($route_directory, '$.')];
-
-						// Инициализаия массива сборщика
-						$collector ??= [];
 
             // Запись в реестр переменных
-						$collector[] = $directories[$i];
+            $directory = $data['vars'][trim($directory, '$')] = $directories[$index];
-
+          }
-						foreach (array_slice($directories, ++$i, preserve_keys: true) as &$urn_directory) {
-							// Перебор директорий URN
-
-							// Запись в реестр переменных
-							$collector[] = $urn_directory;
         }
 
+        // Реиницилазция маршрута
+        $route = self::universalize(implode('/', $data['directories']));
+
+        // Проверка на пустой маршрут
+        if (empty($route)) $route = '/';
+
+        if (mb_stripos($route, $url, 0, "UTF-8") === 0 && mb_strlen($route, 'UTF-8') <= mb_strlen($url, 'UTF-8')) {
+          // Идентифицирован маршрут (длина не меньше длины запрошенного URL)
+
+          if (array_key_exists($method, $data)) {
+            // Идентифицирован метод маршрута (GET, POST, PUT...)
+
+            $route = $data[$method];
+
+            if (class_exists($controller = $core->namespace . '\\controllers\\' . $route['controller'] . $core->controller::POSTFIX)) {
+              // Найден контроллер
+
+              // Инициализация инстанции ядра контроллера
+              $controller = new $controller;
+
+              // Инициализация инстанции ядра модели
+              if (class_exists($model = $core->namespace . '\\models\\' . $route['model'] . $core->model::POSTFIX)) $controller->model = new $model;
+
+              // Вызов связанного с маршрутом методв и возврат (успех)
+              return $controller->{$route['method']}($data['vars'] + $_REQUEST, $_FILES);
+            }
+          }
+
+          // Выход из цикла (провал)
           break;
         }
       }
-
-				// Exit (success or fail)
-				return $data[$method] ?? null;
-			}
     }
 
-		// Exit (fail)
+    // Возврат (провал)
-		return null;
+    return $this->error($core);
   }
 
   /**
-	 * Sorting routes
+   * Сгенерировать ответ с ошибкой
    *
-	 * 1. Short routes
+   * Вызывает метод error404 в инстанции контроллера ошибок
-	 * 2. Long routes
-	 * 3. Short routes with variables (position of variables from "right" to "left")
-	 * 4. Long routes with variables (position of variables from "right" to "left")
-	 * 5. Short routes with collector
-	 * 6. Long routes with collector
-	 * 7. Short routes with variables and collector (position of variables from "right" to "left" then by amount)
-	 * 8. Long routes with variables and collector (position of variables from "right" to "left")
    *
-	 * Добавить чтобы сначала текст потом переменная затем после переменной первыми тексты и в конце перменные опять и так рекурсивно
+   * @param ?core $core Инстанция системного ядра
    *
-	 * @return self The instance from which the method was called (fluent interface)
+   * @return ?string HTML-документ
-	 *
-	 * @todo ПЕРЕДЕЛАТЬ ПОЛНОСТЬЮ
    */
-	public function sort(): self
+  private function error(core $core = new core): ?string
   {
-		uksort($this->routes, function (string $a, string $b) {
+    return class_exists($class = '\\' . $core->namespace . '\\controllers\\errors' . $core->controller::POSTFIX)
-			// Sorting routes
+      && method_exists($class, $method = 'error404')
-
+      ? (new $class)->$method()
-			// Initialization of string lengths (multibyte-safe)
+      : null;
-			$length = [
-				$a => mb_strlen($a),
-				$b => mb_strlen($b)
-			];
-
-			// Initialization of the presence of variables
-			$variables = [
-				$a => preg_match('/\$([a-zA-Z_\x80-\xff]+)(\/|$)/', $a) === 1,
-				$b => preg_match('/\$([a-zA-Z_\x80-\xff]+)(\/|$)/', $b) === 1
-			];
-
-			// Initialization of the presence of collectors
-			$collectors = [
-				$a => preg_match('/\$([a-zA-Z_\x80-\xff]+)\.\.\.$/', $a) === 1,
-				$b => preg_match('/\$([a-zA-Z_\x80-\xff]+)\.\.\.$/', $b) === 1
-			];
-
-
-			if ($variables[$a] && !$variables[$b]) return 1;
-			else if (!$variables[$a] && $variables[$b]) return -1;
-			else if ($variables[$a] && $variables[$b]) {
-			} else if ($collectors[$a] && !$collectors[$b]) return 1;
-			else if (!$collectors[$a] && $collectors[$b]) return -1;
-			else {
-				// NOR variables and XAND collectors (both are not found or both are found)
-
-				// The routes are the same length (no changes)
-				if ($length[$a] === $length[$b]) return 0;
-
-				// The longer route moves to the end
-				return $length[$a] > $length[$b] ? 1 : -1;
-			}
-		});
-
-		// Exit (success) (fluent interface)
-		return $this;
   }
 
   /**
-	 * Universalize URN 
+   * Универсализировать маршрут 
    *
-	 * Always "/" at the beginning and never "/" at the end
+   * @param string $route Маршрут
    *
-	 * @param string $urn URN (/foo/bar)
+   * @return string Универсализированный маршрут
-	 *
-	 * @return string Universalized URN 
    */
-	private function universalize(string $urn): string
+  private function universalize(string $route): string
   {
-		// Universalization of URN and exit (success)
+    // Если не записан "/" в начале, то записать, затем, если записан "/" в конце, то удалить
-		return (string) '/' . mb_trim($urn, '/');
+    return preg_replace('/(.+)\/$/', '$1', preg_replace('/^([^\/])/', '/$1', $route));
   }
 }

mirzaev/minimal/system/traits/magic.php

@@ -1,83 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace mirzaev\minimal\traits;
-
-// Built-in libraries
-use exception;
-
-/**
- * Trait of magical methods
- *
- * @method void __set(string $name, mixed $value) Write property
- * @method mixed __get(string $name) Read property
- * @method void __unset(string $name) Delete property
- * @method bool __isset(string $name) Check property for initialization
- *
- * @package mirzaev\minimal\traits
- *
- * @license http://www.wtfpl.net/ Do What The Fuck You Want To Public License
- * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
- */
-trait magic
-{
-	/**
-	 * Write property
-	 *
-	 * @param string $name Name of the property
-	 * @param mixed $value Value of the property
-	 *
-	 * @return void
-	 */
-	public function __set(string $name, mixed $value = null): void
-	{
-		match ($name) {
-			default => throw new exception('Property "' . static::class . "::\$$name\" not found", 404)
-		};
-	}
-
-	/**
-	 * Read property
-	 *
-	 * @param string $name Name of the property
-	 *
-	 * @return mixed Value of the property
-	 */
-	public function __get(string $name): mixed
-	{
-		return match ($name) {
-			default => throw new exception('Property "' . static::class . "::\$$name\" not found", 404)
-		};
-	}
-
-	/**
-	 * Delete property
-	 *
-	 * @param string $name Name of the property
-	 *
-	 * @return void
-	 */
-	public function __unset(string $name): void
-	{
-		match ($name) {
-			default => (function () use ($name) {
-				unset($this->{$name});
-			})()
-		};
-	}
-
-	/**
-	 * Check property for initialization
-	 *
-	 * @param string $name Name of the property
-	 *
-	 * @return bool Is the property initialized?
-	 */
-	public function __isset(string $name): bool
-	{
-		return match ($name) {
-			default => isset($this->{$name})
-		};
-	}
-}

mirzaev/minimal/system/traits/singleton.php

@@ -1,85 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace mirzaev\minimal\traits;
-
-// Built-in libraries
-use exception;
-
-/**
- * Trait of singleton
- *
- * @method static initialize() Initialize an instance
- *
- * @package mirzaev\minimal\traits
- *
- * @license http://www.wtfpl.net/ Do What The Fuck You Want To Public License
- * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
- */
-trait singleton
-{
-	/**
-	 * Constructor (blocked)
-	 *
-	 * @return void
-	 */
-	final private function __construct()
-	{
-		// Initializing the indicator that an instance of static::class has already been initialized
-		static $instance = false;
-
-		if ($instance) {
-			// An instance of static has already been initialized
-
-			// Exit (fail)
-			throw new exception('Has already been initialized an instance of the ' . static::class);
-		}
-
-		// Writing the indicator that the instance of static been initialized
-		$instance = true;
-	}
-
-	/**
-	 * Initialize an instance
-	 *
-	 * Create an instance of static::class, or return an already created static::class instance
-	 *
-	 * @return static
-	 */
-	public static function initialize(): static
-	{
-		// Initialize the buffer of the instance of static::class
-		static $instance;
-
-		// Exit (success)
-		return $instance ??= new static;
-	}
-
-	/**
-	 * Clone (blocked)
-	 */
-	private function __clone()
-	{
-		// Exit (fail)
-		throw new exception('Cloning is inadmissible');
-	}
-
-	/**
-	 * Sleep (blocked)
-	 */
-	public function __sleep()
-	{
-		// Exit (fail)
-		throw new exception('Serialization is inadmissible');
-	}
-
-	/**
-	 * Wake up (blocked)
-	 */
-	public function __wakeup()
-	{
-		// Exit (fail)
-		throw new exception('Deserialisation is inadmissible');
-	}
-}