From da2bab733833f55785a315ecb5fd4583815679b6 Mon Sep 17 00:00:00 2001
From: User <y_zuev@mail.ru>
Date: Sat, 13 Apr 2024 04:18:46 +0300
Subject: [PATCH] 20240413#4

---
 {src/Common => application}/Components/.gitkeep           | 0
 .../Controllers/AbstractController.php                    | 2 +-
 .../Controllers/AbstractPageController.php                | 8 ++++----
 .../Controllers/NotFoundException.php                     | 2 +-
 {src/Common => application}/Domain/AbstractObject.php     | 2 +-
 .../Repository/AbstractMysqlRepository.php                | 4 ++--
 .../Repository/RepositoryException.php                    | 2 +-
 {src/Common => application}/Services/AbstractDTO.php      | 2 +-
 {src/Common => application}/Services/AbstractService.php  | 2 +-
 {src/Common => application}/Services/DTOException.php     | 2 +-
 {src/Common => application}/Services/ServiceException.php | 2 +-
 composer.json                                             | 1 +
 src/Main/Components/.gitkeep                              | 0
 src/Main/Controllers/IndexController.php                  | 2 +-
 14 files changed, 16 insertions(+), 15 deletions(-)
 rename {src/Common => application}/Components/.gitkeep (100%)
 rename {src/Common => application}/Controllers/AbstractController.php (99%)
 rename {src/Common => application}/Controllers/AbstractPageController.php (86%)
 rename {src/Common => application}/Controllers/NotFoundException.php (61%)
 rename {src/Common => application}/Domain/AbstractObject.php (98%)
 rename {src/Common => application}/Repository/AbstractMysqlRepository.php (91%)
 rename {src/Common => application}/Repository/RepositoryException.php (89%)
 rename {src/Common => application}/Services/AbstractDTO.php (98%)
 rename {src/Common => application}/Services/AbstractService.php (72%)
 rename {src/Common => application}/Services/DTOException.php (89%)
 rename {src/Common => application}/Services/ServiceException.php (89%)
 create mode 100644 src/Main/Components/.gitkeep

diff --git a/src/Common/Components/.gitkeep b/application/Components/.gitkeep
similarity index 100%
rename from src/Common/Components/.gitkeep
rename to application/Components/.gitkeep
diff --git a/src/Common/Controllers/AbstractController.php b/application/Controllers/AbstractController.php
similarity index 99%
rename from src/Common/Controllers/AbstractController.php
rename to application/Controllers/AbstractController.php
index 21e6499..3f739ff 100644
--- a/src/Common/Controllers/AbstractController.php
+++ b/application/Controllers/AbstractController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Common\Controllers;
+namespace Base\Controllers;
 
 use Laminas\Diactoros\Response\HtmlResponse;
 use Laminas\Diactoros\Response\JsonResponse;
diff --git a/src/Common/Controllers/AbstractPageController.php b/application/Controllers/AbstractPageController.php
similarity index 86%
rename from src/Common/Controllers/AbstractPageController.php
rename to application/Controllers/AbstractPageController.php
index 4cdd662..2865097 100644
--- a/src/Common/Controllers/AbstractPageController.php
+++ b/application/Controllers/AbstractPageController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Common\Controllers;
+namespace Base\Controllers;
 
-use App\Common\Repository\RepositoryException;
-use App\Common\Services\DTOException;
-use App\Common\Services\ServiceException;
+use Base\Repository\RepositoryException;
+use Base\Services\DTOException;
+use Base\Services\ServiceException;
 use Exception;
 use Throwable;
 
diff --git a/src/Common/Controllers/NotFoundException.php b/application/Controllers/NotFoundException.php
similarity index 61%
rename from src/Common/Controllers/NotFoundException.php
rename to application/Controllers/NotFoundException.php
index 5412b28..00e47e4 100644
--- a/src/Common/Controllers/NotFoundException.php
+++ b/application/Controllers/NotFoundException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Common\Controllers;
+namespace Base\Controllers;
 
 class NotFoundException extends \Exception {
 
diff --git a/src/Common/Domain/AbstractObject.php b/application/Domain/AbstractObject.php
similarity index 98%
rename from src/Common/Domain/AbstractObject.php
rename to application/Domain/AbstractObject.php
index 726f75f..9a5d06d 100644
--- a/src/Common/Domain/AbstractObject.php
+++ b/application/Domain/AbstractObject.php
@@ -4,7 +4,7 @@
  * User: Zuev Yuri
  */
 
-namespace App\Common\Domain;
+namespace Base\Domain;
 
 abstract class AbstractObject {
 
diff --git a/src/Common/Repository/AbstractMysqlRepository.php b/application/Repository/AbstractMysqlRepository.php
similarity index 91%
rename from src/Common/Repository/AbstractMysqlRepository.php
rename to application/Repository/AbstractMysqlRepository.php
index cff7df7..cb267db 100644
--- a/src/Common/Repository/AbstractMysqlRepository.php
+++ b/application/Repository/AbstractMysqlRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Common\Repository;
+namespace Base\Repository;
 
-use App\Common\Domain\AbstractObject;
+use Base\Domain\AbstractObject;
 use Rmphp\Storage\Mysql\MysqlStorageInterface;
 
 abstract class AbstractMysqlRepository {
diff --git a/src/Common/Repository/RepositoryException.php b/application/Repository/RepositoryException.php
similarity index 89%
rename from src/Common/Repository/RepositoryException.php
rename to application/Repository/RepositoryException.php
index a7f847e..5745154 100644
--- a/src/Common/Repository/RepositoryException.php
+++ b/application/Repository/RepositoryException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Common\Repository;
+namespace Base\Repository;
 
 use Throwable;
 
diff --git a/src/Common/Services/AbstractDTO.php b/application/Services/AbstractDTO.php
similarity index 98%
rename from src/Common/Services/AbstractDTO.php
rename to application/Services/AbstractDTO.php
index ebed9f8..7f3c84d 100644
--- a/src/Common/Services/AbstractDTO.php
+++ b/application/Services/AbstractDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Common\Services;
+namespace Base\Services;
 
 use Exception;
 
diff --git a/src/Common/Services/AbstractService.php b/application/Services/AbstractService.php
similarity index 72%
rename from src/Common/Services/AbstractService.php
rename to application/Services/AbstractService.php
index aec0375..9309e46 100644
--- a/src/Common/Services/AbstractService.php
+++ b/application/Services/AbstractService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Common\Services;
+namespace Base\Services;
 
 use Rmphp\Kernel\Main;
 
diff --git a/src/Common/Services/DTOException.php b/application/Services/DTOException.php
similarity index 89%
rename from src/Common/Services/DTOException.php
rename to application/Services/DTOException.php
index 24eb77b..64114e8 100644
--- a/src/Common/Services/DTOException.php
+++ b/application/Services/DTOException.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace App\Common\Services;
+namespace Base\Services;
 
 use Throwable;
 
diff --git a/src/Common/Services/ServiceException.php b/application/Services/ServiceException.php
similarity index 89%
rename from src/Common/Services/ServiceException.php
rename to application/Services/ServiceException.php
index fc03830..ba29c11 100644
--- a/src/Common/Services/ServiceException.php
+++ b/application/Services/ServiceException.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace App\Common\Services;
+namespace Base\Services;
 
 use Throwable;
 
diff --git a/composer.json b/composer.json
index 14fe75e..0dd3a83 100644
--- a/composer.json
+++ b/composer.json
@@ -21,6 +21,7 @@
 	},
     "autoload": {
         "psr-4": {
+	        "Base\\": "application",
             "App\\": "src"
         }
     },
diff --git a/src/Main/Components/.gitkeep b/src/Main/Components/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/Main/Controllers/IndexController.php b/src/Main/Controllers/IndexController.php
index 9b231df..82b25ab 100644
--- a/src/Main/Controllers/IndexController.php
+++ b/src/Main/Controllers/IndexController.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace App\Main\Controllers;
-use App\Common\Controllers\AbstractPageController;
+use Base\Controllers\AbstractPageController;
 use Psr\Http\Message\ResponseInterface;