Update for oxid 6.2

leofonic · Apr 17, 2020 · 66a1ac3 · 66a1ac3
1 parent d72629c
commit 66a1ac3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     },
     "require":     {
         "php": ">=5.6",
-        "oxid-esales/oxideshop-ce": "^v6.0"
+        "oxid-esales/oxideshop-ce": "^v6.2"
     },
     "autoload":    {
         "psr-4": {

diff --git a/core/Config.php b/core/Config.php
@@ -2,6 +2,9 @@
 
 namespace zunderweb\autoregister_namespaces\core;
 use oxRegistry;
+use OxidEsales\Eshop\Core\Module\Module;
+use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ShopConfigurationDaoBridgeInterface;
 
 class Config extends Config_parent
 {
@@ -20,7 +23,7 @@ public function init()
         $aPrefixesToLoad = oxRegistry::getUtils()->fromFileCache('zwb_autoload_namespaces');
         if ($aPrefixesToLoad === null || !$this->getConfigParam('blZwarProductionMode')){
             $loadedPrefixes = $loader->getPrefixesPsr4();
-            $modulePaths = $this->getConfigParam('aModulePaths');
+            $modulePaths = $this->z_getModulePaths();
             $modulesDir = $this->getModulesDir(true);
             $aPrefixesToLoad = array();
             if (is_array($modulePaths)){
@@ -54,4 +57,20 @@ public function init()
         }
         stopProfile('autoregister_namespaces');
     }
+
+    private function z_getModulePaths(): array
+    {
+        $container = ContainerFactory::getInstance()->getContainer();
+        $shopConfiguration = $container->get(ShopConfigurationDaoBridgeInterface::class)->get();
+
+        $modules = [];
+
+        foreach ($shopConfiguration->getModuleConfigurations() as $moduleConfiguration) {
+            $module = oxNew(Module::class);
+            $path = $moduleConfiguration->getPath();
+            $modules[] = $path;
+        }
+
+        return $modules;
+    }
 }