From 6c571aa358f28f96250f84a16c0ec88ee083591e Mon Sep 17 00:00:00 2001
From: User <y_zuev@mail.ru>
Date: Sun, 5 May 2024 11:09:18 +0300
Subject: [PATCH] 20240505#1

---
 .env.dist                                         | 3 +--
 application/config/container.php                  | 5 +++++
 application/config/factories/containerFactory.php | 9 +++++----
 3 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 application/config/container.php

diff --git a/.env.dist b/.env.dist
index 5695ddf..3393d78 100644
--- a/.env.dist
+++ b/.env.dist
@@ -10,10 +10,9 @@
 
 # PROD / DEV
 APP_MODE=DEV
-
 APP_COMPONENTS_FILE=application/config/app.php
 APP_NODES_FILE=application/config/nodes.php
-CONTAINER_DIR=application/config/container
+CONTAINER_INI=application/config/container.php
 CONTAINER_CACHE=var/cache/container
 
 # Default page
diff --git a/application/config/container.php b/application/config/container.php
new file mode 100644
index 0000000..d9064ed
--- /dev/null
+++ b/application/config/container.php
@@ -0,0 +1,5 @@
+<?php
+return [
+	"application/config/container/services.php",
+	"application/config/container/settings.php",
+];
\ No newline at end of file
diff --git a/application/config/factories/containerFactory.php b/application/config/factories/containerFactory.php
index 5a4c876..c01cd8b 100644
--- a/application/config/factories/containerFactory.php
+++ b/application/config/factories/containerFactory.php
@@ -2,12 +2,13 @@
 
 use DI\ContainerBuilder;
 
-$containerDir = (getenv("CONTAINER_DIR")) ?: "application/config/container";
-$containerCache = (getenv("CONTAINER_CACHE"))?:"var/cache/container";
+$containerIni = (getenv("CONTAINER_INI")) ?: "application/config/container.php";
+$containerCache = (getenv("CONTAINER_CACHE")) ?: "var/cache/container";
+
+$dependencies = require dirname(__DIR__,3).'/'.$containerIni;
 
-$dependencies = glob(dirname(__DIR__,3)."/".$containerDir."/*.php");
 $dependenciesCollection = array_map(function ($dependenciesFile){
-	return require $dependenciesFile;
+	return require dirname(__DIR__,3)."/".$dependenciesFile;
 }, $dependencies);
 
 try {