From 70810412f41289b3aa8d7ce473dd12abee9375f5 Mon Sep 17 00:00:00 2001 From: User Date: Mon, 3 Mar 2025 14:25:44 +0300 Subject: [PATCH] 20250303#2 --- .env.dist | 8 ++++---- application/base/Domain/ValueObject/.gitkeep | 0 .../base/{Controllers => Handlers}/AbstractHandler.php | 2 +- application/bin/cli | 2 +- application/bin/{console.php => cli.php} | 0 application/bin/console | 3 --- application/config/container.php | 5 ----- {application/config => config}/app-cli.php | 2 +- {application/config => config}/app.php | 4 ++-- {application/config => config}/components.php | 8 ++++---- .../config => config}/components/containerFactory.php | 8 ++++---- .../config => config}/components/loggerFactory.php | 2 +- .../config => config}/components/routerFactory.php | 0 .../config => config}/components/templateFactory.php | 0 config/container.php | 5 +++++ {application/config => config}/container/services.php | 0 {application/config => config}/container/settings.php | 0 {application/config => config}/routes/99-main.yaml | 0 {application/config => config}/routes/routes.php | 2 +- src/Infrastructure/Handlers/IndexHandler.php | 2 +- 20 files changed, 25 insertions(+), 28 deletions(-) create mode 100644 application/base/Domain/ValueObject/.gitkeep rename application/base/{Controllers => Handlers}/AbstractHandler.php (98%) rename application/bin/{console.php => cli.php} (100%) delete mode 100644 application/bin/console delete mode 100644 application/config/container.php rename {application/config => config}/app-cli.php (82%) rename {application/config => config}/app.php (62%) rename {application/config => config}/components.php (63%) rename {application/config => config}/components/containerFactory.php (65%) rename {application/config => config}/components/loggerFactory.php (57%) rename {application/config => config}/components/routerFactory.php (100%) rename {application/config => config}/components/templateFactory.php (100%) create mode 100644 config/container.php rename {application/config => config}/container/services.php (100%) rename {application/config => config}/container/settings.php (100%) rename {application/config => config}/routes/99-main.yaml (100%) rename {application/config => config}/routes/routes.php (84%) diff --git a/.env.dist b/.env.dist index 33e0dc9..38f9352 100644 --- a/.env.dist +++ b/.env.dist @@ -10,10 +10,10 @@ # PROD / DEV APP_MODE=DEV -APP_NODES_FILE=application/config/app.php -CLI_NODES_FILE=application/config/app-cli.php -APP_COMPONENTS_FILE=application/config/components.php -CONTAINER_INI=application/config/container.php +APP_NODES_FILE=config/app.php +CLI_NODES_FILE=config/app-cli.php +APP_COMPONENTS_FILE=config/components.php +CONTAINER_INI=config/container.php CONTAINER_CACHE=var/cache/container # Default page diff --git a/application/base/Domain/ValueObject/.gitkeep b/application/base/Domain/ValueObject/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/application/base/Controllers/AbstractHandler.php b/application/base/Handlers/AbstractHandler.php similarity index 98% rename from application/base/Controllers/AbstractHandler.php rename to application/base/Handlers/AbstractHandler.php index ede564c..69ff2a1 100644 --- a/application/base/Controllers/AbstractHandler.php +++ b/application/base/Handlers/AbstractHandler.php @@ -1,6 +1,6 @@ '/', "action"=>"App\\Main\\Controllers\\IndexController", "method"=>"index"], -# ['key'=>'', 'router'=>'application/config/routes-cli/routes.php'], +# ['key'=>'', 'router'=>'config/routes-cli/routes.php'], # ['key'=>'/', 'router'=>[]], return [ diff --git a/application/config/app.php b/config/app.php similarity index 62% rename from application/config/app.php rename to config/app.php index e0ed3f8..b768540 100644 --- a/application/config/app.php +++ b/config/app.php @@ -5,9 +5,9 @@ # Example: # ['key'=>'/', "action"=>"App\\Main\\Controllers\\IndexController", "method"=>"index"], -# ['key'=>'/', 'router'=>'application/config/routes/main/routes.php'], +# ['key'=>'/', 'router'=>'config/routes/main/routes.php'], # ['key'=>'/', 'router'=>[]], return [ - ['key'=>'/', 'router'=>'application/config/routes/routes.php'], + ['key'=>'/', 'router'=>'config/routes/routes.php'], ]; diff --git a/application/config/components.php b/config/components.php similarity index 63% rename from application/config/components.php rename to config/components.php index 4259ea6..77b97ee 100644 --- a/application/config/components.php +++ b/config/components.php @@ -4,17 +4,17 @@ return [ /** * Путь к файлу фабрики возвращающий реализацию RouterInterface или сам экземпляр класса */ - \Rmphp\Foundation\RouterInterface::class => 'application/config/components/routerFactory.php', + \Rmphp\Foundation\RouterInterface::class => 'config/components/routerFactory.php', /** * Путь к файлу фабрики возвращающий реализацию TemplateInterface или сам экземпляр класса */ - \Rmphp\Foundation\TemplateInterface::class => 'application/config/components/templateFactory.php', + \Rmphp\Foundation\TemplateInterface::class => 'config/components/templateFactory.php', /** * Путь к файлу фабрики возвращающий реализацию PSR-3 LoggerInterface или сам экземпляр класса */ - \Psr\Log\LoggerInterface::class => 'application/config/components/loggerFactory.php', + \Psr\Log\LoggerInterface::class => 'config/components/loggerFactory.php', /** * Путь к файлу фабрики возвращающий реализацию PSR-11 ContainerInterface или сам экземпляр класса */ - \Psr\Container\ContainerInterface::class => 'application/config/components/containerFactory.php', + \Psr\Container\ContainerInterface::class => 'config/components/containerFactory.php', ]; diff --git a/application/config/components/containerFactory.php b/config/components/containerFactory.php similarity index 65% rename from application/config/components/containerFactory.php rename to config/components/containerFactory.php index c01cd8b..e27eeee 100644 --- a/application/config/components/containerFactory.php +++ b/config/components/containerFactory.php @@ -2,18 +2,18 @@ use DI\ContainerBuilder; -$containerIni = (getenv("CONTAINER_INI")) ?: "application/config/container.php"; +$containerIni = (getenv("CONTAINER_INI")) ?: "config/container.php"; $containerCache = (getenv("CONTAINER_CACHE")) ?: "var/cache/container"; -$dependencies = require dirname(__DIR__,3).'/'.$containerIni; +$dependencies = require dirname(__DIR__,2).'/'.$containerIni; $dependenciesCollection = array_map(function ($dependenciesFile){ - return require dirname(__DIR__,3)."/".$dependenciesFile; + return require dirname(__DIR__,2)."/".$dependenciesFile; }, $dependencies); try { $builder = new ContainerBuilder(); - if(getenv("APP_MODE") == "PROD") $builder->enableCompilation(dirname(__DIR__,3)."/".$containerCache); + if(getenv("APP_MODE") == "PROD") $builder->enableCompilation(dirname(__DIR__,2)."/".$containerCache); $builder->addDefinitions(array_replace_recursive(...$dependenciesCollection)); return $builder->build(); } catch (Exception $e) {echo $e->getMessage();} diff --git a/application/config/components/loggerFactory.php b/config/components/loggerFactory.php similarity index 57% rename from application/config/components/loggerFactory.php rename to config/components/loggerFactory.php index 01598a6..e18b6bf 100644 --- a/application/config/components/loggerFactory.php +++ b/config/components/loggerFactory.php @@ -1,2 +1,2 @@ pushHandler(new \Monolog\Handler\StreamHandler(dirname(__DIR__, 3).'/var/logs/log'.date('Ymd').'.log')); +return (new \Monolog\Logger('system'))->pushHandler(new \Monolog\Handler\StreamHandler(dirname(__DIR__, 2).'/var/logs/log'.date('Ymd').'.log')); diff --git a/application/config/components/routerFactory.php b/config/components/routerFactory.php similarity index 100% rename from application/config/components/routerFactory.php rename to config/components/routerFactory.php diff --git a/application/config/components/templateFactory.php b/config/components/templateFactory.php similarity index 100% rename from application/config/components/templateFactory.php rename to config/components/templateFactory.php diff --git a/config/container.php b/config/container.php new file mode 100644 index 0000000..f336b2e --- /dev/null +++ b/config/container.php @@ -0,0 +1,5 @@ +