Small tweak to use namespace case convention for 3.x, and add an extr…

…a possible namespace format.
modmore · Mar 16, 2023 · 9b4827f · 9b4827f
1 parent cea9319
commit 9b4827f
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/Command/BuildCommand.php b/src/Command/BuildCommand.php
@@ -435,12 +435,16 @@ public function buildObjects($folder, $type)
 
         $this->resolveConflicts($folder, $type);
 
-        if (
-            class_exists('\modX\Revolution\modNamespace') &&
-            in_array($type['class'], ['modNamespace', '\modNamespace', '\modX\Revolution\modNamespace'], true)
-        ) {
-            $this->modx->getCacheManager()-> generateNamespacesCache('namespaces');
-            \modX\Revolution\modNamespace::loadCache($this->modx);
+        // Due to autoloading via namespaces (bootstrap.php) in MODX 3.x, rebuild namespace cache.
+        $namespaces = [
+            'modNamespace',
+            '\modNamespace',
+            'MODX\Revolution\modNamespace',
+            '\MODX\Revolution\modNamespace',
+        ];
+        if (class_exists('\MODX\Revolution\modNamespace') && in_array($type['class'], $namespaces, true)) {
+            $this->modx->getCacheManager()->generateNamespacesCache('namespaces');
+            \MODX\Revolution\modNamespace::loadCache($this->modx);
         }
     }