Enforce same ordering as we load classes with autoloader

MahoCommerce · Oct 5, 2024 · 6435ca1 · 6435ca1
1 parent 0de0cc5
commit 6435ca1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/app/Mage.php b/app/Mage.php
@@ -55,7 +55,7 @@
 
 $modules = mahoGetComposerInstallationData();
 foreach ($modules as $module => $info) {
-    if (str_contains($module, 'mahocommerce/maho')) {
+    if ($module === 'mahocommerce/maho') {
         continue;
     }
     foreach ($info['codePools'] as $dir) {
@@ -73,7 +73,7 @@
     $paths[] = BP . '/lib';
 }
 foreach ($modules as $module => $info) {
-    if (str_contains($module, 'mahocommerce/maho')) {
+    if ($module === 'mahocommerce/maho') {
         continue;
     }
     foreach ($info['extraDirs'] as $dir) {

diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
@@ -340,9 +340,13 @@ public function loadBase()
             }
         }
 
-        // Include all other vendor files, except those we already added from core
-        foreach (glob(BP . '/vendor/*/*/app/etc/*.xml') as $file) {
-            if (!MAHO_IS_CHILD_PROJECT || !str_starts_with($file, MAHO_FRAMEWORK_DIR)) {
+        // Include all other module files, except those from Maho source
+        $modules = mahoGetComposerInstallationData();
+        foreach ($modules as $module => $info) {
+            if ($module === 'mahocommerce/maho') {
+                continue;
+            }
+            foreach (glob(BP . "/vendor/$module/app/etc/*.xml") as $file) {
                 $files[basename($file)] = $file;
             }
         }
@@ -839,9 +843,13 @@ protected function _getDeclaredModuleFiles()
             }
         }
 
-        // Include all other vendor files, except those we already added from core
-        foreach (glob(BP . '/vendor/*/*/app/etc/modules/*.xml') as $file) {
-            if (!MAHO_IS_CHILD_PROJECT || !str_starts_with($file, MAHO_FRAMEWORK_DIR)) {
+        // Include all other module files, except those from Maho source
+        $modules = mahoGetComposerInstallationData();
+        foreach ($modules as $module => $info) {
+            if ($module === 'mahocommerce/maho') {
+                continue;
+            }
+            foreach (glob(BP . "/vendor/$module/app/etc/modules/*.xml") as $file) {
                 $moduleFiles[basename($file)] = $file;
             }
         }

diff --git a/app/code/core/Mage/Core/Model/Design/Config.php b/app/code/core/Mage/Core/Model/Design/Config.php
@@ -50,11 +50,14 @@ public function __construct(array $params = [])
                 }
             }
 
-            // Include all other vendor files, except those we already added from core
-            foreach (glob(BP . '/vendor/*/*/app/design/*/*/*/etc/theme.xml') as $file) {
-                if (!MAHO_IS_CHILD_PROJECT || !str_starts_with($file, MAHO_FRAMEWORK_DIR)) {
-                    $normalizedFile = str_replace(BP . '/vendor/', '', $file);
-                    $normalizedFile = implode('/', array_slice(explode('/', $normalizedFile), 4));
+            // Include all other module files, except those from Maho source
+            $modules = mahoGetComposerInstallationData();
+            foreach ($modules as $module => $info) {
+                if ($module === 'mahocommerce/maho') {
+                    continue;
+                }
+                foreach (glob(BP . "/vendor/$module/app/design/*/*/*/etc/theme.xml") as $file) {
+                    $normalizedFile = str_replace(BP . "/vendor/$module", '', $file);
                     $files[$normalizedFile] = $file;
                 }
             }