Названия деволтных контейнеров вынесены в параметры для возможности п…

…ереопределения
KodiCMS · Oct 31, 2015 · 11508d7 · 11508d7
1 parent 2a467bc
commit 11508d7
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/ModulesLoader.php b/src/ModulesLoader.php
@@ -17,6 +17,16 @@ class ModulesLoader
      */
     protected $shutdownCallbacks = [ ];
 
+    /**
+     * @var string
+     */
+    protected $defaultContainerClass = '\\App\\DefaultModuleContainer';
+
+    /**
+     * @var string
+     */
+    protected $applicationContainerClass = '\\App\\ModuleContainer';
+
 
     /**
      * @param array $modulesList
@@ -85,20 +95,20 @@ public function addModule($moduleName, $modulePath = null, $namespace = null, $m
 
         $namespace = trim($namespace, '\\');
 
-        $defaultModuleClass = '\\App\\DefaultModuleContainer';
-
         $customModuleClass = "\\$namespace\\ModuleContainer";
 
         if ($moduleName == 'App') {
-            $customModuleClass = "\\App\\ModuleContainer";
+            $customModuleClass = $this->applicationContainerClass;
         }
 
         if (is_null($moduleContainerClass) or class_exists($customModuleClass)) {
             $moduleContainerClass = $customModuleClass;
         }
 
         if ( ! class_exists($moduleContainerClass)) {
-            $moduleContainerClass = class_exists($defaultModuleClass) ? $defaultModuleClass : \KodiCMS\ModulesLoader\ModuleContainer::class;
+            $moduleContainerClass = class_exists($this->defaultContainerClass)
+                ? $this->defaultContainerClass
+                : \KodiCMS\ModulesLoader\ModuleContainer::class;
         }
 
         $moduleContainer = new $moduleContainerClass($moduleName, $modulePath, $namespace);