change namespace and composer.json

composer.json

@@ -1,26 +1,41 @@
 {
-    "name": "mirzaev/calculator",
+    "name": "mirzaev/tordv-calculator",
-    "description": "Калькулятор рассчетов затрат для предприятия по резке металла",
+    "description": "Калькулятор стоимости услуг по обработке металла",
-    "type": "project",
+    "readme": "README.md",
-    "license": "AGPL-3.0-or-later",
+    "keywords": [
-    "homepage": "https://git.hood.su/mirzaev/calculator",
+        "site",
+        "calculator"
+    ],
+    "type": "site",
+    "homepage": "https://git.mirzaev.sexy/mirzaev/tordv-calculator",
+    "license": "WTFPL",
     "authors": [
         {
             "name": "Arsen Mirzaev Tatyano-Muradovich",
             "email": "arsen@mirzaev.sexy",
             "homepage": "https://mirzaev.sexy",
-            "role": "Developer"
+            "role": "Programmer"
         }
     ],
-    "require": {
+    "support": {
-        "php": "^8.0.0",
+        "email": "arsen@mirzaev.sexy",
-        "mirzaev/minimal": "^2.0.x-dev",
+        "wiki": "https://git.mirzaev.sexy/mirzaev/tordv-calculator/wiki",
-        "twig/twig": "^3.3",
+        "issues": "https://git.mirzaev.sexy/mirzaev/tordv-calculator/issues"
-        "phpoffice/phpspreadsheet": "^1.20"
     },
-    "autoload": {
+    "funding": [
-        "psr-4": {
+        {
-            "mirzaev\\calculator\\": "mirzaev/calculator/system"
+            "type": "funding",
+            "url": "https://fund.mirzaev.sexy"
+        ],
+        "require": {
+            "php": "^8.0.0",
+            "mirzaev/minimal": "^2.0.x-dev",
+            "twig/twig": "^3.3",
+            "phpoffice/phpspreadsheet": "^1.20"
+        },
+        "autoload": {
+            "psr-4": {
+                "mirzaev\\tordv\\calculator\\": "mirzaev/tordv/calculator/system"
+            }
         }
     }
-}

mirzaev/tordv/calculator/system/controllers/accounts_controller.php

@@ -2,16 +2,16 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\controllers;
+namespace mirzaev\tordv\calculator\controllers;
 
-use mirzaev\calculator\controllers\core;
+use mirzaev\tordv\calculator\controllers\core;
 
-use mirzaev\calculator\models\accounts_model as accounts;
+use mirzaev\tordv\calculator\models\accounts_model as accounts;
 
 /**
  * Контроллер пользователей
  *
- * @package mirzaev\calculator\controllers
+ * @package mirzaev\tordv\calculator\controllers
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class accounts_controller extends core

mirzaev/tordv/calculator/system/controllers/calculator_controller.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\controllers;
+namespace mirzaev\tordv\calculator\controllers;
 
 use Exception;
-use mirzaev\calculator\controllers\core;
+use mirzaev\tordv\calculator\controllers\core;
-use mirzaev\calculator\models\calculators_model as calculators;
+use mirzaev\tordv\calculator\models\calculators_model as calculators;
-use mirzaev\calculator\models\settings_model as settings;
+use mirzaev\tordv\calculator\models\settings_model as settings;
-use mirzaev\calculator\models\metals_model as metals;
+use mirzaev\tordv\calculator\models\metals_model as metals;
 
 use Twig\Loader\FilesystemLoader;
 use Twig\Environment as view;
@@ -16,7 +16,7 @@ use Twig\Environment as view;
 /**
  * Контроллер основной страницы
  *
- * @package mirzaev\calculator\controllers
+ * @package mirzaev\tordv\calculator\controllers
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class calculator_controller extends core

mirzaev/tordv/calculator/system/controllers/contacts_controller.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\controllers;
+namespace mirzaev\tordv\calculator\controllers;
 
-use mirzaev\calculator\controllers\core;
+use mirzaev\tordv\calculator\controllers\core;
-use mirzaev\calculator\models\accounts_model as accounts;
+use mirzaev\tordv\calculator\models\accounts_model as accounts;
 
 /**
  * Контроллер контактов
  *
- * @package mirzaev\calculator\controllers
+ * @package mirzaev\tordv\calculator\controllers
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class contacts_controller extends core

mirzaev/tordv/calculator/system/controllers/core.php

@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\controllers;
+namespace mirzaev\tordv\calculator\controllers;
 
-use mirzaev\calculator\views\manager;
+use mirzaev\tordv\calculator\views\manager;
-use mirzaev\calculator\models\core as models;
+use mirzaev\tordv\calculator\models\core as models;
 
 use mirzaev\minimal\controller;
 
 /**
  * Менеджер представлений
  *
- * @package mirzaev\calculator\controllers
+ * @package mirzaev\tordv\calculator\controllers
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 class core extends controller

mirzaev/tordv/calculator/system/controllers/errors_controller.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\controllers;
+namespace mirzaev\tordv\calculator\controllers;
 
-use mirzaev\calculator\controllers\core;
+use mirzaev\tordv\calculator\controllers\core;
 
 use Twig\Loader\FilesystemLoader;
 use Twig\Environment as view;
@@ -12,7 +12,7 @@ use Twig\Environment as view;
 /**
  * Контроллер основной страницы
  *
- * @package mirzaev\calculator\controllers
+ * @package mirzaev\tordv\calculator\controllers
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class errors_controller extends core

mirzaev/tordv/calculator/system/controllers/journal_controller.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\controllers;
+namespace mirzaev\tordv\calculator\controllers;
 
-use mirzaev\calculator\controllers\core;
+use mirzaev\tordv\calculator\controllers\core;
-use mirzaev\calculator\models\accounts_model as accounts;
+use mirzaev\tordv\calculator\models\accounts_model as accounts;
 
 /**
  * Контроллер журналов
  *
- * @package mirzaev\calculator\controllers
+ * @package mirzaev\tordv\calculator\controllers
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class journal_controller extends core

mirzaev/tordv/calculator/system/controllers/main_controller.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\controllers;
+namespace mirzaev\tordv\calculator\controllers;
 
-use mirzaev\calculator\controllers\core;
+use mirzaev\tordv\calculator\controllers\core;
-use mirzaev\calculator\models\accounts_model as accounts;
+use mirzaev\tordv\calculator\models\accounts_model as accounts;
 
 use Twig\Loader\FilesystemLoader;
 use Twig\Environment as view;
@@ -13,7 +13,7 @@ use Twig\Environment as view;
 /**
  * Контроллер основной страницы
  *
- * @package mirzaev\calculator\controllers
+ * @package mirzaev\tordv\calculator\controllers
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class main_controller extends core

mirzaev/tordv/calculator/system/controllers/settings_controller.php

@@ -2,16 +2,16 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\controllers;
+namespace mirzaev\tordv\calculator\controllers;
 
-use mirzaev\calculator\controllers\core;
+use mirzaev\tordv\calculator\controllers\core;
-use mirzaev\calculator\models\accounts_model as accounts;
+use mirzaev\tordv\calculator\models\accounts_model as accounts;
-use mirzaev\calculator\models\settings_model as settings;
+use mirzaev\tordv\calculator\models\settings_model as settings;
 
 /**
  * Контроллер настроек
  *
- * @package mirzaev\calculator\controllers
+ * @package mirzaev\tordv\calculator\controllers
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class settings_controller extends core

mirzaev/tordv/calculator/system/controllers/supplies_controller.php

@@ -2,25 +2,25 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\controllers;
+namespace mirzaev\tordv\calculator\controllers;
 
-use mirzaev\calculator\controllers\core;
+use mirzaev\tordv\calculator\controllers\core;
-use mirzaev\calculator\models\accounts_model as accounts;
+use mirzaev\tordv\calculator\models\accounts_model as accounts;
-use mirzaev\calculator\models\supplies_model as supplies;
+use mirzaev\tordv\calculator\models\supplies_model as supplies;
 
-use mirzaev\calculator\models\filters\import_aluminum_filter;
+use mirzaev\tordv\calculator\models\filters\import_aluminum_filter;
-use mirzaev\calculator\models\filters\import_brass_filter;
+use mirzaev\tordv\calculator\models\filters\import_brass_filter;
-use mirzaev\calculator\models\filters\import_copper_filter;
+use mirzaev\tordv\calculator\models\filters\import_copper_filter;
-use mirzaev\calculator\models\filters\import_stainless_steel_filter;
+use mirzaev\tordv\calculator\models\filters\import_stainless_steel_filter;
-use mirzaev\calculator\models\filters\import_steel_filter;
+use mirzaev\tordv\calculator\models\filters\import_steel_filter;
-use mirzaev\calculator\models\filters\import_galvanized_steel_filter;
+use mirzaev\tordv\calculator\models\filters\import_galvanized_steel_filter;
 
 use Exception;
 
 /**
  * Контроллер поставок
  *
- * @package mirzaev\calculator\controllers
+ * @package mirzaev\tordv\calculator\controllers
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class supplies_controller extends core

mirzaev/tordv/calculator/system/models/accounts_model.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models;
+namespace mirzaev\tordv\calculator\models;
 
 use pdo;
 use exception;
@@ -10,7 +10,7 @@ use exception;
 /**
  * Модель регистрации, аутентификации и авторизации
  *
- * @package mirzaev\calculator\models
+ * @package mirzaev\tordv\calculator\models
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class accounts_model extends core

mirzaev/tordv/calculator/system/models/baloons_model.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models;
+namespace mirzaev\tordv\calculator\models;
 
 use exception;
 use pdo;
@@ -10,7 +10,7 @@ use pdo;
 /**
  * Модель баллонов
  *
- * @package mirzaev\calculator\models
+ * @package mirzaev\tordv\calculator\models
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  *
  * @todo

mirzaev/tordv/calculator/system/models/calculators_model.php

@@ -2,18 +2,18 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models;
+namespace mirzaev\tordv\calculator\models;
 
-use mirzaev\calculator\models\settings_model as settings;
+use mirzaev\tordv\calculator\models\settings_model as settings;
-use mirzaev\calculator\models\metals_model as metals;
+use mirzaev\tordv\calculator\models\metals_model as metals;
-use mirzaev\calculator\models\baloons_model as baloons;
+use mirzaev\tordv\calculator\models\baloons_model as baloons;
 
 use exception;
 
 /**
  * Модель калькуляторов
  *
- * @package mirzaev\calculator\models
+ * @package mirzaev\tordv\calculator\models
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class calculators_model extends core

mirzaev/tordv/calculator/system/models/core.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models;
+namespace mirzaev\tordv\calculator\models;
 
 use mirzaev\minimal\model;
 
@@ -14,7 +14,7 @@ use exception;
 /**
  * Ядро моделей
  *
- * @package mirzaev\calculator\models
+ * @package mirzaev\tordv\calculator\models
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 class core extends model

mirzaev/tordv/calculator/system/models/filters/import_aluminum_filter.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models\filters;
+namespace mirzaev\tordv\calculator\models\filters;
 
-use mirzaev\calculator\models\filters\import_filter_noname_1;
+use mirzaev\tordv\calculator\models\filters\import_filter_noname_1;
 
 /**
  * Фильтр импорта цен на алюминий от неизвестного поставщика под номером 1
  *
- * @package mirzaev\calculator\models\filters
+ * @package mirzaev\tordv\calculator\models\filters
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class import_aluminum_filter extends import_filter_noname_1

mirzaev/tordv/calculator/system/models/filters/import_brass_filter.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models\filters;
+namespace mirzaev\tordv\calculator\models\filters;
 
-use mirzaev\calculator\models\filters\import_filter_noname_1;
+use mirzaev\tordv\calculator\models\filters\import_filter_noname_1;
 
 /**
  * Фильтр импорта цен на латунь от неизвестного поставщика под номером 1
  *
- * @package mirzaev\calculator\models\filters
+ * @package mirzaev\tordv\calculator\models\filters
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class import_brass_filter extends import_filter_noname_1

mirzaev/tordv/calculator/system/models/filters/import_copper_filter.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models\filters;
+namespace mirzaev\tordv\calculator\models\filters;
 
-use mirzaev\calculator\models\filters\import_filter_noname_1;
+use mirzaev\tordv\calculator\models\filters\import_filter_noname_1;
 
 /**
  * Фильтр импорта цен на медь от неизвестного поставщика под номером 1
  *
- * @package mirzaev\calculator\models\filters
+ * @package mirzaev\tordv\calculator\models\filters
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class import_copper_filter extends import_filter_noname_1

mirzaev/tordv/calculator/system/models/filters/import_filter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models\filters;
+namespace mirzaev\tordv\calculator\models\filters;
 
 use PhpOffice\PhpSpreadsheet\Reader\IReadFilter as filter;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
@@ -10,7 +10,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 /**
  * Интерфейс фильтра импорта
  *
- * @package mirzaev\calculator\models\filters
+ * @package mirzaev\tordv\calculator\models\filters
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 interface import_filter extends filter

mirzaev/tordv/calculator/system/models/filters/import_filter_mc.php

@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models\filters;
+namespace mirzaev\tordv\calculator\models\filters;
 
-use mirzaev\calculator\models\filters\import_filter as filter;
+use mirzaev\tordv\calculator\models\filters\import_filter as filter;
-use mirzaev\calculator\models\metals_model as metals;
+use mirzaev\tordv\calculator\models\metals_model as metals;
 
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 /**
  * Фильтр импорта для документов от "МЕТАЛЛСЕРВИС"
  *
- * @package mirzaev\calculator\models\filters
+ * @package mirzaev\tordv\calculator\models\filters
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 class import_filter_mc implements filter

mirzaev/tordv/calculator/system/models/filters/import_filter_noname_1.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models\filters;
+namespace mirzaev\tordv\calculator\models\filters;
 
-use mirzaev\calculator\models\filters\import_filter as filter;
+use mirzaev\tordv\calculator\models\filters\import_filter as filter;
-use mirzaev\calculator\models\metals_model as metals;
+use mirzaev\tordv\calculator\models\metals_model as metals;
 
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
@@ -13,7 +13,7 @@ use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 /**
  * Фильтр импорта для документов от неизвестного поставщика под номером 1
  *
- * @package mirzaev\calculator\models\filters
+ * @package mirzaev\tordv\calculator\models\filters
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 class import_filter_noname_1 implements filter

mirzaev/tordv/calculator/system/models/filters/import_galvanized_steel_filter.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models\filters;
+namespace mirzaev\tordv\calculator\models\filters;
 
-use mirzaev\calculator\models\filters\import_filter_noname_1;
+use mirzaev\tordv\calculator\models\filters\import_filter_noname_1;
 
 /**
  * Фильтр импорта цен на оцинкованную сталь от "МЕТАЛЛСЕРВИС"
  *
- * @package mirzaev\calculator\models\filters
+ * @package mirzaev\tordv\calculator\models\filters
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  *
  * @todo 1. Доделать 982 до 992 строки

mirzaev/tordv/calculator/system/models/filters/import_stainless_steel_filter.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models\filters;
+namespace mirzaev\tordv\calculator\models\filters;
 
-use mirzaev\calculator\models\filters\import_filter_noname_1;
+use mirzaev\tordv\calculator\models\filters\import_filter_noname_1;
 
 /**
  * Фильтр импорта цен на нержавеющую сталь от неизвестного поставщика под номером 1
  *
- * @package mirzaev\calculator\models\filters
+ * @package mirzaev\tordv\calculator\models\filters
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  *
  * @todo 1. Доделать 982 до 992 строки

mirzaev/tordv/calculator/system/models/filters/import_steel_filter.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models\filters;
+namespace mirzaev\tordv\calculator\models\filters;
 
-use mirzaev\calculator\models\filters\import_filter_mc;
+use mirzaev\tordv\calculator\models\filters\import_filter_mc;
 
 /**
  * Фильтр импорта цен на чёрную сталь от "МЕТАЛЛСЕРВИС"
  *
- * @package mirzaev\calculator\models\filters
+ * @package mirzaev\tordv\calculator\models\filters
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class import_steel_filter extends import_filter_mc

mirzaev/tordv/calculator/system/models/metals_model.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models;
+namespace mirzaev\tordv\calculator\models;
 
-use mirzaev\calculator\models\settings_model as settings;
+use mirzaev\tordv\calculator\models\settings_model as settings;
-use mirzaev\calculator\models\accounts_model as accounts;
+use mirzaev\tordv\calculator\models\accounts_model as accounts;
 
 use pdo;
 use exception;
@@ -13,7 +13,7 @@ use exception;
 /**
  * Модель металла
  *
- * @package mirzaev\calculator\models
+ * @package mirzaev\tordv\calculator\models
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class metals_model extends core

mirzaev/tordv/calculator/system/models/settings_model.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models;
+namespace mirzaev\tordv\calculator\models;
 
 use pdo;
 use exception;
@@ -10,7 +10,7 @@ use exception;
 /**
  * Модель настроек
  *
- * @package mirzaev\calculator\models
+ * @package mirzaev\tordv\calculator\models
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class settings_model extends core

mirzaev/tordv/calculator/system/models/supplies_model.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\models;
+namespace mirzaev\tordv\calculator\models;
 
-use mirzaev\calculator\models\accounts_model as accounts;
+use mirzaev\tordv\calculator\models\accounts_model as accounts;
-use mirzaev\calculator\models\filters\import_filter as filter;
+use mirzaev\tordv\calculator\models\filters\import_filter as filter;
 
 use PhpOffice\PhpSpreadsheet\Reader\Xls as reader;
 
@@ -15,7 +15,7 @@ use exception;
 /**
  * Модель поставки
  *
- * @package mirzaev\calculator\models
+ * @package mirzaev\tordv\calculator\models
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class supplies_model extends core

mirzaev/tordv/calculator/system/public/index.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator;
+namespace mirzaev\tordv\calculator;
 
 use mirzaev\minimal\core;
 use mirzaev\minimal\router;

mirzaev/tordv/calculator/system/views/manager.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace mirzaev\calculator\views;
+namespace mirzaev\tordv\calculator\views;
 
 use mirzaev\minimal\controller;
 
@@ -12,7 +12,7 @@ use Twig\Environment as view;
 /**
  * Менеджер представлений
  *
- * @package mirzaev\calculator\controllers
+ * @package mirzaev\tordv\calculator\controllers
  * @author Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
  */
 final class manager extends controller