Merge pull request #38 from onysko/master

Fixed modules loading
samsonos · Apr 4, 2016 · f4f594a · f4f594a
2 parents e9449e4 + 5764bf3
commit f4f594a
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/Core.php b/src/Core.php
@@ -441,13 +441,16 @@ public function composer($dependencyFilePath = null)
 
         $localModulesPath = '../src';
         ResourceMap::get('cache');
-        $resourceMap = ResourceMap::get($localModulesPath);
-
-        foreach ($resourceMap->modules as $moduleFile) {
-            $modulePath = str_replace(realpath($localModulesPath), '', $moduleFile[1]);
-            $modulePath = explode('/', $modulePath);
-            $modulePath = $localModulesPath.'/'.$modulePath[1];
-            $this->load($modulePath, $parameters);
+        // TODO: Nested modules relation
+        for ($i = 0; $i < 2; $i++) {
+            $resourceMap = ResourceMap::get($localModulesPath);
+
+            foreach ($resourceMap->modules as $moduleFile) {
+                $modulePath = str_replace(realpath($localModulesPath), '', $moduleFile[1]);
+                $modulePath = explode('/', $modulePath);
+                $modulePath = $localModulesPath . '/' . $modulePath[1];
+                $this->load($modulePath, $parameters);
+            }
         }
 
         // Create local module and set it as active