From 035f88ea72ba19b8ce15ed8d4a91c21ca1bde492 Mon Sep 17 00:00:00 2001
From: User <y_zuev@mail.ru>
Date: Sat, 2 Nov 2024 07:31:03 +0300
Subject: [PATCH] 20241102#1

---
 .env.dist                                        |  6 +++---
 README.md                                        |  2 +-
 .../base}/Application/AbstractDTO.php            |  2 +-
 .../base}/Application/ApplicationException.php   |  2 +-
 .../base}/Application/DTOException.php           |  2 +-
 application/base/Components/.gitkeep             |  0
 .../base}/Controllers/AbstractController.php     |  2 +-
 .../base}/Controllers/AbstractPageController.php |  8 ++++----
 .../base}/Controllers/NotFoundException.php      |  2 +-
 .../base}/Domain/AbstractObject.php              |  2 +-
 .../base}/Domain/DomainException.php             |  2 +-
 .../base}/Domain/EntityInterface.php             |  2 +-
 .../base}/Domain/ValueObjectInterface.php        |  2 +-
 .../base}/Repository/AbstractMysqlRepository.php |  4 ++--
 .../base}/Repository/AbstractRepository.md       |  0
 .../base}/Repository/AbstractRepository.php      |  4 ++--
 .../base}/Repository/RepositoryException.php     |  2 +-
 {config => application/config}/app.php           |  2 +-
 {config => application/config}/components.php    |  8 ++++----
 .../config}/components/containerFactory.php      |  8 ++++----
 .../config}/components/loggerFactory.php         |  2 +-
 .../config}/components/routerFactory.php         |  0
 .../config}/components/templateFactory.php       |  0
 application/config/container.php                 |  5 +++++
 .../config}/container/services.php               |  0
 .../config}/container/settings.php               |  0
 .../config/routes/99-main.yaml                   |  0
 application/config/routes/routes.php             | 16 ++++++++++++++++
 cli/.gitkeep                                     |  0
 composer.json                                    |  3 ++-
 config/container.php                             |  5 -----
 config/routes/routes.php                         | 15 ---------------
 .../Controllers/IndexController.php              |  2 +-
 33 files changed, 56 insertions(+), 54 deletions(-)
 rename {src/Infrastructure/Base => application/base}/Application/AbstractDTO.php (94%)
 rename {src/Infrastructure/Base => application/base}/Application/ApplicationException.php (85%)
 rename {src/Infrastructure/Base => application/base}/Application/DTOException.php (84%)
 create mode 100644 application/base/Components/.gitkeep
 rename {src/Infrastructure/Base => application/base}/Controllers/AbstractController.php (98%)
 rename {src/Infrastructure/Base => application/base}/Controllers/AbstractPageController.php (82%)
 rename {src/Infrastructure/Base => application/base}/Controllers/NotFoundException.php (54%)
 rename {src/Infrastructure/Base => application/base}/Domain/AbstractObject.php (87%)
 rename {src/Infrastructure/Base => application/base}/Domain/DomainException.php (86%)
 rename {src/Infrastructure/Base => application/base}/Domain/EntityInterface.php (81%)
 rename {src/Infrastructure/Base => application/base}/Domain/ValueObjectInterface.php (82%)
 rename {src/Infrastructure/Base => application/base}/Repository/AbstractMysqlRepository.php (91%)
 rename {src/Infrastructure/Base => application/base}/Repository/AbstractRepository.md (100%)
 rename {src/Infrastructure/Base => application/base}/Repository/AbstractRepository.php (96%)
 rename {src/Infrastructure/Base => application/base}/Repository/RepositoryException.php (85%)
 rename {config => application/config}/app.php (82%)
 rename {config => application/config}/components.php (63%)
 rename {config => application/config}/components/containerFactory.php (65%)
 rename {config => application/config}/components/loggerFactory.php (57%)
 rename {config => application/config}/components/routerFactory.php (100%)
 rename {config => application/config}/components/templateFactory.php (100%)
 create mode 100644 application/config/container.php
 rename {config => application/config}/container/services.php (100%)
 rename {config => application/config}/container/settings.php (100%)
 rename config/routes/90-main.yaml => application/config/routes/99-main.yaml (100%)
 create mode 100644 application/config/routes/routes.php
 create mode 100644 cli/.gitkeep
 delete mode 100644 config/container.php
 delete mode 100644 config/routes/routes.php

diff --git a/.env.dist b/.env.dist
index 72ed017..0534fbc 100644
--- a/.env.dist
+++ b/.env.dist
@@ -10,9 +10,9 @@
 
 # PROD / DEV
 APP_MODE=DEV
-APP_NODES_FILE=config/app.php
-APP_COMPONENTS_FILE=config/components.php
-CONTAINER_INI=config/container.php
+APP_NODES_FILE=application/config/app.php
+APP_COMPONENTS_FILE=application/config/components.php
+CONTAINER_INI=application/config/container.php
 CONTAINER_CACHE=var/cache/container
 
 # Default page
diff --git a/README.md b/README.md
index 39b1982..efe0a2a 100644
--- a/README.md
+++ b/README.md
@@ -9,5 +9,5 @@ composer create-project rmphp/skeleton project-name
 ```
 
 ```bash
-composer create-project rmphp/skeleton:"^4.0" project-name
+composer create-project rmphp/skeleton:"^4.1" project-name
 ```
diff --git a/src/Infrastructure/Base/Application/AbstractDTO.php b/application/base/Application/AbstractDTO.php
similarity index 94%
rename from src/Infrastructure/Base/Application/AbstractDTO.php
rename to application/base/Application/AbstractDTO.php
index 5ffeae9..01be224 100644
--- a/src/Infrastructure/Base/Application/AbstractDTO.php
+++ b/application/base/Application/AbstractDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Infrastructure\Base\Application;
+namespace Base\Application;
 
 use ReflectionClass;
 
diff --git a/src/Infrastructure/Base/Application/ApplicationException.php b/application/base/Application/ApplicationException.php
similarity index 85%
rename from src/Infrastructure/Base/Application/ApplicationException.php
rename to application/base/Application/ApplicationException.php
index 25f8537..b3fc550 100644
--- a/src/Infrastructure/Base/Application/ApplicationException.php
+++ b/application/base/Application/ApplicationException.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace App\Infrastructure\Base\Application;
+namespace Base\Application;
 
 use Throwable;
 
diff --git a/src/Infrastructure/Base/Application/DTOException.php b/application/base/Application/DTOException.php
similarity index 84%
rename from src/Infrastructure/Base/Application/DTOException.php
rename to application/base/Application/DTOException.php
index e9fdb9a..5cb21d1 100644
--- a/src/Infrastructure/Base/Application/DTOException.php
+++ b/application/base/Application/DTOException.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace App\Infrastructure\Base\Application;
+namespace Base\Application;
 
 use Throwable;
 
diff --git a/application/base/Components/.gitkeep b/application/base/Components/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/Infrastructure/Base/Controllers/AbstractController.php b/application/base/Controllers/AbstractController.php
similarity index 98%
rename from src/Infrastructure/Base/Controllers/AbstractController.php
rename to application/base/Controllers/AbstractController.php
index 2955518..2939f88 100644
--- a/src/Infrastructure/Base/Controllers/AbstractController.php
+++ b/application/base/Controllers/AbstractController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Infrastructure\Base\Controllers;
+namespace Base\Controllers;
 
 use Laminas\Diactoros\Response\HtmlResponse;
 use Laminas\Diactoros\Response\JsonResponse;
diff --git a/src/Infrastructure/Base/Controllers/AbstractPageController.php b/application/base/Controllers/AbstractPageController.php
similarity index 82%
rename from src/Infrastructure/Base/Controllers/AbstractPageController.php
rename to application/base/Controllers/AbstractPageController.php
index 2711b81..ebb2e3f 100644
--- a/src/Infrastructure/Base/Controllers/AbstractPageController.php
+++ b/application/base/Controllers/AbstractPageController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Infrastructure\Base\Controllers;
+namespace Base\Controllers;
 
-use App\Infrastructure\Base\Application\ApplicationException;
-use App\Infrastructure\Base\Application\DTOException;
-use App\Infrastructure\Base\Domain\DomainException;
+use Base\Application\ApplicationException;
+use Base\Application\DTOException;
+use Base\Domain\DomainException;
 use Exception;
 use Throwable;
 
diff --git a/src/Infrastructure/Base/Controllers/NotFoundException.php b/application/base/Controllers/NotFoundException.php
similarity index 54%
rename from src/Infrastructure/Base/Controllers/NotFoundException.php
rename to application/base/Controllers/NotFoundException.php
index 09317fd..6936465 100644
--- a/src/Infrastructure/Base/Controllers/NotFoundException.php
+++ b/application/base/Controllers/NotFoundException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Infrastructure\Base\Controllers;
+namespace Base\Controllers;
 
 class NotFoundException extends \Exception {
 
diff --git a/src/Infrastructure/Base/Domain/AbstractObject.php b/application/base/Domain/AbstractObject.php
similarity index 87%
rename from src/Infrastructure/Base/Domain/AbstractObject.php
rename to application/base/Domain/AbstractObject.php
index 8428af3..13a0082 100644
--- a/src/Infrastructure/Base/Domain/AbstractObject.php
+++ b/application/base/Domain/AbstractObject.php
@@ -4,7 +4,7 @@
  * User: Zuev Yuri
  */
 
-namespace App\Infrastructure\Base\Domain;
+namespace Base\Domain;
 
 abstract class AbstractObject implements EntityInterface {
 
diff --git a/src/Infrastructure/Base/Domain/DomainException.php b/application/base/Domain/DomainException.php
similarity index 86%
rename from src/Infrastructure/Base/Domain/DomainException.php
rename to application/base/Domain/DomainException.php
index 8e2da71..12b359d 100644
--- a/src/Infrastructure/Base/Domain/DomainException.php
+++ b/application/base/Domain/DomainException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Infrastructure\Base\Domain;
+namespace Base\Domain;
 
 use Throwable;
 
diff --git a/src/Infrastructure/Base/Domain/EntityInterface.php b/application/base/Domain/EntityInterface.php
similarity index 81%
rename from src/Infrastructure/Base/Domain/EntityInterface.php
rename to application/base/Domain/EntityInterface.php
index 5cad5a4..b08b2df 100644
--- a/src/Infrastructure/Base/Domain/EntityInterface.php
+++ b/application/base/Domain/EntityInterface.php
@@ -6,7 +6,7 @@
  * Time: 3:58
  */
 
-namespace App\Infrastructure\Base\Domain;
+namespace Base\Domain;
 
 interface EntityInterface {
 
diff --git a/src/Infrastructure/Base/Domain/ValueObjectInterface.php b/application/base/Domain/ValueObjectInterface.php
similarity index 82%
rename from src/Infrastructure/Base/Domain/ValueObjectInterface.php
rename to application/base/Domain/ValueObjectInterface.php
index 86c2030..b650c11 100644
--- a/src/Infrastructure/Base/Domain/ValueObjectInterface.php
+++ b/application/base/Domain/ValueObjectInterface.php
@@ -6,7 +6,7 @@
  * Time: 3:58
  */
 
-namespace App\Infrastructure\Base\Domain;
+namespace Base\Domain;
 
 interface ValueObjectInterface {
 
diff --git a/src/Infrastructure/Base/Repository/AbstractMysqlRepository.php b/application/base/Repository/AbstractMysqlRepository.php
similarity index 91%
rename from src/Infrastructure/Base/Repository/AbstractMysqlRepository.php
rename to application/base/Repository/AbstractMysqlRepository.php
index 6a32189..b1e56b4 100644
--- a/src/Infrastructure/Base/Repository/AbstractMysqlRepository.php
+++ b/application/base/Repository/AbstractMysqlRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Infrastructure\Base\Repository;
+namespace Base\Repository;
 
-use App\Infrastructure\Base\Domain\EntityInterface;
+use Base\Domain\EntityInterface;
 use Rmphp\Storage\Mysql\MysqlStorageInterface;
 
 abstract class AbstractMysqlRepository extends AbstractRepository {
diff --git a/src/Infrastructure/Base/Repository/AbstractRepository.md b/application/base/Repository/AbstractRepository.md
similarity index 100%
rename from src/Infrastructure/Base/Repository/AbstractRepository.md
rename to application/base/Repository/AbstractRepository.md
diff --git a/src/Infrastructure/Base/Repository/AbstractRepository.php b/application/base/Repository/AbstractRepository.php
similarity index 96%
rename from src/Infrastructure/Base/Repository/AbstractRepository.php
rename to application/base/Repository/AbstractRepository.php
index 109d59b..3e59a43 100644
--- a/src/Infrastructure/Base/Repository/AbstractRepository.php
+++ b/application/base/Repository/AbstractRepository.php
@@ -6,9 +6,9 @@
  * Time: 13:06
  */
 
-namespace App\Infrastructure\Base\Repository;
+namespace Base\Repository;
 
-use App\Infrastructure\Base\Domain\ValueObjectInterface;
+use Base\Domain\ValueObjectInterface;
 use ReflectionClass;
 use ReflectionException;
 
diff --git a/src/Infrastructure/Base/Repository/RepositoryException.php b/application/base/Repository/RepositoryException.php
similarity index 85%
rename from src/Infrastructure/Base/Repository/RepositoryException.php
rename to application/base/Repository/RepositoryException.php
index 6aff07c..c1df0fe 100644
--- a/src/Infrastructure/Base/Repository/RepositoryException.php
+++ b/application/base/Repository/RepositoryException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Infrastructure\Base\Repository;
+namespace Base\Repository;
 
 use Throwable;
 
diff --git a/config/app.php b/application/config/app.php
similarity index 82%
rename from config/app.php
rename to application/config/app.php
index 09dcf56..e0ed3f8 100644
--- a/config/app.php
+++ b/application/config/app.php
@@ -9,5 +9,5 @@
 # ['key'=>'/', 'router'=>[]],
 
 return [
-	['key'=>'/', 'router'=>'config/routes/routes.php'],
+	['key'=>'/', 'router'=>'application/config/routes/routes.php'],
 ];
diff --git a/config/components.php b/application/config/components.php
similarity index 63%
rename from config/components.php
rename to application/config/components.php
index 77b97ee..4259ea6 100644
--- a/config/components.php
+++ b/application/config/components.php
@@ -4,17 +4,17 @@ return [
 	/**
 	 * Путь к файлу фабрики возвращающий реализацию RouterInterface или сам экземпляр класса
 	 */
-	\Rmphp\Foundation\RouterInterface::class => 'config/components/routerFactory.php',
+	\Rmphp\Foundation\RouterInterface::class => 'application/config/components/routerFactory.php',
 	/**
 	 * Путь к файлу фабрики возвращающий реализацию TemplateInterface или сам экземпляр класса
 	 */
-	\Rmphp\Foundation\TemplateInterface::class => 'config/components/templateFactory.php',
+	\Rmphp\Foundation\TemplateInterface::class => 'application/config/components/templateFactory.php',
 	/**
 	 * Путь к файлу фабрики возвращающий реализацию PSR-3 LoggerInterface или сам экземпляр класса
 	 */
-	\Psr\Log\LoggerInterface::class => 'config/components/loggerFactory.php',
+	\Psr\Log\LoggerInterface::class => 'application/config/components/loggerFactory.php',
 	/**
 	 * Путь к файлу фабрики возвращающий реализацию PSR-11 ContainerInterface или сам экземпляр класса
 	 */
-	\Psr\Container\ContainerInterface::class => 'config/components/containerFactory.php',
+	\Psr\Container\ContainerInterface::class => 'application/config/components/containerFactory.php',
 ];
diff --git a/config/components/containerFactory.php b/application/config/components/containerFactory.php
similarity index 65%
rename from config/components/containerFactory.php
rename to application/config/components/containerFactory.php
index e27eeee..c01cd8b 100644
--- a/config/components/containerFactory.php
+++ b/application/config/components/containerFactory.php
@@ -2,18 +2,18 @@
 
 use DI\ContainerBuilder;
 
-$containerIni = (getenv("CONTAINER_INI")) ?: "config/container.php";
+$containerIni = (getenv("CONTAINER_INI")) ?: "application/config/container.php";
 $containerCache = (getenv("CONTAINER_CACHE")) ?: "var/cache/container";
 
-$dependencies = require dirname(__DIR__,2).'/'.$containerIni;
+$dependencies = require dirname(__DIR__,3).'/'.$containerIni;
 
 $dependenciesCollection = array_map(function ($dependenciesFile){
-	return require dirname(__DIR__,2)."/".$dependenciesFile;
+	return require dirname(__DIR__,3)."/".$dependenciesFile;
 }, $dependencies);
 
 try {
 	$builder = new ContainerBuilder();
-	if(getenv("APP_MODE") == "PROD") $builder->enableCompilation(dirname(__DIR__,2)."/".$containerCache);
+	if(getenv("APP_MODE") == "PROD") $builder->enableCompilation(dirname(__DIR__,3)."/".$containerCache);
 	$builder->addDefinitions(array_replace_recursive(...$dependenciesCollection));
 	return $builder->build();
 } catch (Exception $e) {echo $e->getMessage();}
diff --git a/config/components/loggerFactory.php b/application/config/components/loggerFactory.php
similarity index 57%
rename from config/components/loggerFactory.php
rename to application/config/components/loggerFactory.php
index e18b6bf..01598a6 100644
--- a/config/components/loggerFactory.php
+++ b/application/config/components/loggerFactory.php
@@ -1,2 +1,2 @@
 <?php
-return (new \Monolog\Logger('system'))->pushHandler(new \Monolog\Handler\StreamHandler(dirname(__DIR__, 2).'/var/logs/log'.date('Ymd').'.log'));
+return (new \Monolog\Logger('system'))->pushHandler(new \Monolog\Handler\StreamHandler(dirname(__DIR__, 3).'/var/logs/log'.date('Ymd').'.log'));
diff --git a/config/components/routerFactory.php b/application/config/components/routerFactory.php
similarity index 100%
rename from config/components/routerFactory.php
rename to application/config/components/routerFactory.php
diff --git a/config/components/templateFactory.php b/application/config/components/templateFactory.php
similarity index 100%
rename from config/components/templateFactory.php
rename to application/config/components/templateFactory.php
diff --git a/application/config/container.php b/application/config/container.php
new file mode 100644
index 0000000..bcef79a
--- /dev/null
+++ b/application/config/container.php
@@ -0,0 +1,5 @@
+<?php
+return [
+	"application/config/container/services.php",
+	"application/config/container/settings.php",
+];
diff --git a/config/container/services.php b/application/config/container/services.php
similarity index 100%
rename from config/container/services.php
rename to application/config/container/services.php
diff --git a/config/container/settings.php b/application/config/container/settings.php
similarity index 100%
rename from config/container/settings.php
rename to application/config/container/settings.php
diff --git a/config/routes/90-main.yaml b/application/config/routes/99-main.yaml
similarity index 100%
rename from config/routes/90-main.yaml
rename to application/config/routes/99-main.yaml
diff --git a/application/config/routes/routes.php b/application/config/routes/routes.php
new file mode 100644
index 0000000..fdeb878
--- /dev/null
+++ b/application/config/routes/routes.php
@@ -0,0 +1,16 @@
+<?php
+
+$cashFile = preg_replace("'.application.*$'",'', __DIR__).'/var/routes/'.md5(__FILE__);
+
+if(getenv("APP_MODE") == "PROD" && file_exists($cashFile)){
+	return unserialize(file_get_contents($cashFile));
+} else {
+	$routesCollection = array_map(function ($routesFile){
+		return file_get_contents($routesFile).PHP_EOL;
+	}, glob(__DIR__."/{*.yaml}", GLOB_BRACE));
+
+	$routes = yaml_parse(implode($routesCollection));
+	if (!is_dir(dirname($cashFile))) mkdir(dirname($cashFile), 0777, true);
+	file_put_contents($cashFile, serialize($routes));
+	return $routes;
+}
diff --git a/cli/.gitkeep b/cli/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/composer.json b/composer.json
index 972c761..e0dfbdf 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,8 @@
 	},
     "autoload": {
         "psr-4": {
-	        "App\\": "src"
+	        "App\\": "src",
+	        "Base\\": "application/base"
         }
     },
 	"scripts": {
diff --git a/config/container.php b/config/container.php
deleted file mode 100644
index f336b2e..0000000
--- a/config/container.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return [
-	"config/container/services.php",
-	"config/container/settings.php",
-];
diff --git a/config/routes/routes.php b/config/routes/routes.php
deleted file mode 100644
index ea32e67..0000000
--- a/config/routes/routes.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(getenv("APP_MODE") == "PROD" && file_exists(dirname(__DIR__,2).'/var/routes/routes-main')){
-	return unserialize(file_get_contents(dirname(__DIR__,2).'/var/routes/routes-main'));
-} else {
-	$routesCollection = array_map(function ($routesFile){
-		return file_get_contents($routesFile).PHP_EOL;
-	}, glob(__DIR__."/{*.yaml}", GLOB_BRACE));
-
-	$routes = yaml_parse(implode($routesCollection));
-
-	if (!is_dir(dirname(__DIR__, 2).'/var/routes')) mkdir(dirname(__DIR__, 2).'/var/routes', 0777, true);
-	file_put_contents(dirname(__DIR__, 2).'/var/routes/routes-main', serialize($routes));
-	return $routes;
-}
diff --git a/src/Infrastructure/Controllers/IndexController.php b/src/Infrastructure/Controllers/IndexController.php
index 5fc13bf..8b5da3f 100644
--- a/src/Infrastructure/Controllers/IndexController.php
+++ b/src/Infrastructure/Controllers/IndexController.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace App\Infrastructure\Controllers;
-use App\Infrastructure\Base\Controllers\AbstractPageController;
+use Base\Controllers\AbstractPageController;
 use Psr\Http\Message\ResponseInterface;
 
 class IndexController extends AbstractPageController {