From cb5408be4a66c9d128bb71611921213b41e7d6b8 Mon Sep 17 00:00:00 2001 From: User Date: Sat, 13 Apr 2024 11:33:47 +0300 Subject: [PATCH] 20240413#7 --- .env.dist | 9 +++++---- {config => application/config}/app.php | 8 ++++---- {config => application/config}/container/services.php | 0 {config => application/config}/container/settings.php | 0 .../config}/factories/containerFactory.php | 6 +++--- application/config/factories/loggerFactory.php | 2 ++ .../config}/factories/routerFactory.php | 0 .../config}/factories/templateFactory.php | 0 {config => application/config}/nodes.php | 2 +- {config => application/config}/routes/main/09-main.yaml | 0 {config => application/config}/routes/main/routes.php | 0 application/{ => src}/Components/.gitkeep | 0 application/{ => src}/Controllers/AbstractController.php | 0 .../{ => src}/Controllers/AbstractPageController.php | 0 application/{ => src}/Controllers/NotFoundException.php | 0 application/{ => src}/Domain/AbstractObject.php | 0 .../{ => src}/Repository/AbstractMysqlRepository.php | 0 application/{ => src}/Repository/RepositoryException.php | 0 application/{ => src}/Services/AbstractDTO.php | 0 application/{ => src}/Services/AbstractService.php | 0 application/{ => src}/Services/DTOException.php | 0 application/{ => src}/Services/ServiceException.php | 0 composer.json | 2 +- config/factories/loggerFactory.php | 2 -- 24 files changed, 16 insertions(+), 15 deletions(-) rename {config => application/config}/app.php (64%) rename {config => application/config}/container/services.php (100%) rename {config => application/config}/container/settings.php (100%) rename {config => application/config}/factories/containerFactory.php (63%) create mode 100644 application/config/factories/loggerFactory.php rename {config => application/config}/factories/routerFactory.php (100%) rename {config => application/config}/factories/templateFactory.php (100%) rename {config => application/config}/nodes.php (80%) rename {config => application/config}/routes/main/09-main.yaml (100%) rename {config => application/config}/routes/main/routes.php (100%) rename application/{ => src}/Components/.gitkeep (100%) rename application/{ => src}/Controllers/AbstractController.php (100%) rename application/{ => src}/Controllers/AbstractPageController.php (100%) rename application/{ => src}/Controllers/NotFoundException.php (100%) rename application/{ => src}/Domain/AbstractObject.php (100%) rename application/{ => src}/Repository/AbstractMysqlRepository.php (100%) rename application/{ => src}/Repository/RepositoryException.php (100%) rename application/{ => src}/Services/AbstractDTO.php (100%) rename application/{ => src}/Services/AbstractService.php (100%) rename application/{ => src}/Services/DTOException.php (100%) rename application/{ => src}/Services/ServiceException.php (100%) delete mode 100644 config/factories/loggerFactory.php diff --git a/.env.dist b/.env.dist index cbe7d5d..9419f8d 100644 --- a/.env.dist +++ b/.env.dist @@ -9,10 +9,11 @@ # Real environment variables win over .env files. # PROD / DEV -APP_MODE=DEV -APP_COMPONENTS_FILE=config/app.php -APP_NODES_FILE=config/nodes.php -CONTAINER_DIR=config/container +APP_MODE=PROD + +APP_COMPONENTS_FILE=application/config/app.php +APP_NODES_FILE=application/config/nodes.php +CONTAINER_DIR=application/config/container CONTAINER_CACHE=var/cache/container # Default page diff --git a/config/app.php b/application/config/app.php similarity index 64% rename from config/app.php rename to application/config/app.php index bcdf9df..309f0fb 100644 --- a/config/app.php +++ b/application/config/app.php @@ -4,18 +4,18 @@ return [ /** * Путь к файлу фабрики возвращающий реализацию RouterInterface или сам экземпляр класса */ - \Rmphp\Foundation\RouterInterface::class => 'config/factories/routerFactory.php', + \Rmphp\Foundation\RouterInterface::class => 'application/config/factories/routerFactory.php', /** * Путь к файлу фабрики возвращающий реализацию TemplateInterface или сам экземпляр класса */ - \Rmphp\Foundation\TemplateInterface::class => 'config/factories/templateFactory.php', + \Rmphp\Foundation\TemplateInterface::class => 'application/config/factories/templateFactory.php', /** * Путь к файлу фабрики возвращающий реализацию PSR-3 LoggerInterface или сам экземпляр класса */ - \Psr\Log\LoggerInterface::class => 'config/factories/loggerFactory.php', + \Psr\Log\LoggerInterface::class => 'application/config/factories/loggerFactory.php', /** * Путь к файлу фабрики возвращающий реализацию PSR-11 ContainerInterface или сам экземпляр класса */ - \Psr\Container\ContainerInterface::class => 'config/factories/containerFactory.php', + \Psr\Container\ContainerInterface::class => 'application/config/factories/containerFactory.php', ]; \ No newline at end of file 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/factories/containerFactory.php b/application/config/factories/containerFactory.php similarity index 63% rename from config/factories/containerFactory.php rename to application/config/factories/containerFactory.php index 5d6f857..5a4c876 100644 --- a/config/factories/containerFactory.php +++ b/application/config/factories/containerFactory.php @@ -2,17 +2,17 @@ use DI\ContainerBuilder; -$containerDir = (getenv("CONTAINER_DIR"))?:"config/container"; +$containerDir = (getenv("CONTAINER_DIR")) ?: "application/config/container"; $containerCache = (getenv("CONTAINER_CACHE"))?:"var/cache/container"; -$dependencies = glob(dirname(__DIR__,2)."/".$containerDir."/*.php"); +$dependencies = glob(dirname(__DIR__,3)."/".$containerDir."/*.php"); $dependenciesCollection = array_map(function ($dependenciesFile){ return require $dependenciesFile; }, $dependencies); try { $builder = new ContainerBuilder(); - if(getenv("APP_MODE") != "DEV") $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/application/config/factories/loggerFactory.php b/application/config/factories/loggerFactory.php new file mode 100644 index 0000000..01598a6 --- /dev/null +++ b/application/config/factories/loggerFactory.php @@ -0,0 +1,2 @@ +pushHandler(new \Monolog\Handler\StreamHandler(dirname(__DIR__, 3).'/var/logs/log'.date('Ymd').'.log')); diff --git a/config/factories/routerFactory.php b/application/config/factories/routerFactory.php similarity index 100% rename from config/factories/routerFactory.php rename to application/config/factories/routerFactory.php diff --git a/config/factories/templateFactory.php b/application/config/factories/templateFactory.php similarity index 100% rename from config/factories/templateFactory.php rename to application/config/factories/templateFactory.php diff --git a/config/nodes.php b/application/config/nodes.php similarity index 80% rename from config/nodes.php rename to application/config/nodes.php index 1711881..32374bf 100644 --- a/config/nodes.php +++ b/application/config/nodes.php @@ -9,6 +9,6 @@ # ['key'=>'/', 'router'=>[]], return [ - ['key'=>'/', 'router'=>'config/routes/main/routes.php'], + ['key'=>'/', 'router'=>'application/config/routes/main/routes.php'], ]; \ No newline at end of file diff --git a/config/routes/main/09-main.yaml b/application/config/routes/main/09-main.yaml similarity index 100% rename from config/routes/main/09-main.yaml rename to application/config/routes/main/09-main.yaml diff --git a/config/routes/main/routes.php b/application/config/routes/main/routes.php similarity index 100% rename from config/routes/main/routes.php rename to application/config/routes/main/routes.php diff --git a/application/Components/.gitkeep b/application/src/Components/.gitkeep similarity index 100% rename from application/Components/.gitkeep rename to application/src/Components/.gitkeep diff --git a/application/Controllers/AbstractController.php b/application/src/Controllers/AbstractController.php similarity index 100% rename from application/Controllers/AbstractController.php rename to application/src/Controllers/AbstractController.php diff --git a/application/Controllers/AbstractPageController.php b/application/src/Controllers/AbstractPageController.php similarity index 100% rename from application/Controllers/AbstractPageController.php rename to application/src/Controllers/AbstractPageController.php diff --git a/application/Controllers/NotFoundException.php b/application/src/Controllers/NotFoundException.php similarity index 100% rename from application/Controllers/NotFoundException.php rename to application/src/Controllers/NotFoundException.php diff --git a/application/Domain/AbstractObject.php b/application/src/Domain/AbstractObject.php similarity index 100% rename from application/Domain/AbstractObject.php rename to application/src/Domain/AbstractObject.php diff --git a/application/Repository/AbstractMysqlRepository.php b/application/src/Repository/AbstractMysqlRepository.php similarity index 100% rename from application/Repository/AbstractMysqlRepository.php rename to application/src/Repository/AbstractMysqlRepository.php diff --git a/application/Repository/RepositoryException.php b/application/src/Repository/RepositoryException.php similarity index 100% rename from application/Repository/RepositoryException.php rename to application/src/Repository/RepositoryException.php diff --git a/application/Services/AbstractDTO.php b/application/src/Services/AbstractDTO.php similarity index 100% rename from application/Services/AbstractDTO.php rename to application/src/Services/AbstractDTO.php diff --git a/application/Services/AbstractService.php b/application/src/Services/AbstractService.php similarity index 100% rename from application/Services/AbstractService.php rename to application/src/Services/AbstractService.php diff --git a/application/Services/DTOException.php b/application/src/Services/DTOException.php similarity index 100% rename from application/Services/DTOException.php rename to application/src/Services/DTOException.php diff --git a/application/Services/ServiceException.php b/application/src/Services/ServiceException.php similarity index 100% rename from application/Services/ServiceException.php rename to application/src/Services/ServiceException.php diff --git a/composer.json b/composer.json index e5ad747..db90f57 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "autoload": { "psr-4": { "App\\": "src", - "Base\\": "application" + "Base\\": "application/src" } }, "scripts": { diff --git a/config/factories/loggerFactory.php b/config/factories/loggerFactory.php deleted file mode 100644 index f0b8491..0000000 --- a/config/factories/loggerFactory.php +++ /dev/null @@ -1,2 +0,0 @@ -pushHandler(new \Monolog\Handler\StreamHandler(__DIR__.'/../../var/logs/log'.date('Ymd').'.log'));