base/MenuSystem - remove Phalcon dependency, in theory it was possible to offer multiple model paths in the phalcon configuration, in practice this was never used (all models live in /usr/local/opnsense/mvc/app/models).

for #6389

Author: AdSchellevis

src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php

@@ -30,7 +30,6 @@
 namespace OPNsense\Base\Menu;
 
 use OPNsense\Core\Config;
-use Phalcon\Di\FactoryDefault;
 
 /**
  * Class MenuSystem
@@ -111,38 +110,29 @@ public function invalidateCache()
      */
     public function persist($nowait = true)
     {
-        // fetch our model locations
-        if (!empty(FactoryDefault::getDefault()->get('config')->application->modelsDir)) {
-            $modelDirs = FactoryDefault::getDefault()->get('config')->application->modelsDir;
-            if (!is_array($modelDirs) && !is_object($modelDirs)) {
-                $modelDirs = array($modelDirs);
-            }
-        } else {
-            // failsafe, if we don't have a Phalcon Dependency Injector object, use our relative location
-            $modelDirs = array("__DIR__.'/../../../");
-        }
+        // find out models location
+        $modelDir = __DIR__.'/../../../';
 
         // collect all XML menu definitions into a single file
         $menuXml = new \DOMDocument('1.0');
         $root = $menuXml->createElement('menu');
         $menuXml->appendChild($root);
         // crawl all vendors and modules and add menu definitions
-        foreach ($modelDirs as $modelDir) {
-            foreach (glob(preg_replace('#/+#', '/', "{$modelDir}/*")) as $vendor) {
-                foreach (glob($vendor . '/*') as $module) {
-                    $menu_cfg_xml = $module . '/Menu/Menu.xml';
-                    if (file_exists($menu_cfg_xml)) {
-                        try {
-                            $domNode = dom_import_simplexml($this->addXML($menu_cfg_xml));
-                            $domNode = $root->ownerDocument->importNode($domNode, true);
-                            $root->appendChild($domNode);
-                        } catch (MenuInitException $e) {
-                            error_log($e);
-                        }
+        foreach (glob(preg_replace('#/+#', '/', "{$modelDir}/*")) as $vendor) {
+            foreach (glob($vendor . '/*') as $module) {
+                $menu_cfg_xml = $module . '/Menu/Menu.xml';
+                if (file_exists($menu_cfg_xml)) {
+                    try {
+                        $domNode = dom_import_simplexml($this->addXML($menu_cfg_xml));
+                        $domNode = $root->ownerDocument->importNode($domNode, true);
+                        $root->appendChild($domNode);
+                    } catch (MenuInitException $e) {
+                        error_log($e);
                     }
                 }
             }
         }
+
         // flush to disk
         $fp = fopen($this->menuCacheFilename, file_exists($this->menuCacheFilename) ? "r+" : "w+");
         $lockMode = $nowait ? LOCK_EX | LOCK_NB : LOCK_EX;