From ab76fb03c9628da6f6e7831effb07a4e0422a5ab Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sat, 4 May 2024 20:21:35 +0200
Subject: [PATCH] mvc - cleanups for
 https://github.com/opnsense/core/issues/6389

* remove unused FactoryDefault() in tests
* refactor FactoryDefault() config access to new AppConfig class
* remove unused code in afterExecuteRoute() `$this->response->getHeaders()->get("Status")` will never be null
---
 .../OPNsense/Base/ApiControllerBase.php       | 21 +++++++------------
 .../mvc/app/library/OPNsense/Core/Config.php  |  4 ++--
 .../mvc/app/library/OPNsense/Core/Shell.php   |  7 ++++---
 src/opnsense/mvc/tests/setup.php              | 11 +---------
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
index 3b7d1acd8..34291034a 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
@@ -395,19 +395,14 @@ class ApiControllerBase extends ControllerRoot
      */
     public function afterExecuteRoute($dispatcher)
     {
-        // exit when response headers are already set
-        if ($this->response->getHeaders()->get("Status") != null) {
-            return false;
-        } else {
-            // process response, serialize to json object
-            $data = $dispatcher->getReturnedValue();
-            if (is_array($data)) {
-                $this->response->setContentType('application/json', 'UTF-8');
-                if ($this->isExternalClient()) {
-                    $this->response->setContent(json_encode($data));
-                } else {
-                    $this->response->setContent(htmlspecialchars(json_encode($data), ENT_NOQUOTES));
-                }
+        // process response, serialize to json object
+        $data = $dispatcher->getReturnedValue();
+        if (is_array($data)) {
+            $this->response->setContentType('application/json', 'UTF-8');
+            if ($this->isExternalClient()) {
+                $this->response->setContent(json_encode($data));
+            } else {
+                $this->response->setContent(htmlspecialchars(json_encode($data), ENT_NOQUOTES));
             }
         }
 
diff --git a/src/opnsense/mvc/app/library/OPNsense/Core/Config.php b/src/opnsense/mvc/app/library/OPNsense/Core/Config.php
index 40a042803..e96e7eb95 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Core/Config.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Core/Config.php
@@ -28,7 +28,7 @@
 
 namespace OPNsense\Core;
 
-use Phalcon\Di\FactoryDefault;
+use OPNsense\Core\AppConfig;
 use OPNsense\Core\Syslog;
 
 /**
@@ -324,7 +324,7 @@ class Config extends Singleton
     protected function init()
     {
         $this->statusIsLocked = false;
-        $this->config_file = FactoryDefault::getDefault()->get('config')->globals->config_path . "config.xml";
+        $this->config_file = (new AppConfig())->globals->config_path . "config.xml";
         try {
             $this->load();
         } catch (\Exception $e) {
diff --git a/src/opnsense/mvc/app/library/OPNsense/Core/Shell.php b/src/opnsense/mvc/app/library/OPNsense/Core/Shell.php
index 016c99360..7288cb2d8 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Core/Shell.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Core/Shell.php
@@ -28,7 +28,7 @@
 
 namespace OPNsense\Core;
 
-use Phalcon\Di\FactoryDefault;
+use OPNsense\Core\AppConfig;
 
 /**
  * Class Shell shell/command handling routines
@@ -54,8 +54,9 @@ class Shell
     public function __construct()
     {
         // init, set simulation mode / debug autoput
-        $this->simulate = FactoryDefault::getDefault()->get('config')->globals->simulate_mode;
-        $this->debug = FactoryDefault::getDefault()->get('config')->globals->debug;
+        $appconfig = new AppConfig();
+        $this->simulate = $appconfig->globals->simulate_mode;
+        $this->debug = $appconfig->globals->debug;
     }
 
     /**
diff --git a/src/opnsense/mvc/tests/setup.php b/src/opnsense/mvc/tests/setup.php
index b2ae724f0..dd5bbc60f 100644
--- a/src/opnsense/mvc/tests/setup.php
+++ b/src/opnsense/mvc/tests/setup.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2016 Deciso B.V.
+ * Copyright (C) 2016 - 2024 Deciso B.V.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,9 +26,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-use Phalcon\Di\Di;
-use Phalcon\Di\FactoryDefault;
-
 /**
  * Read the configuration
  */
@@ -41,9 +38,3 @@ $config = include __DIR__ . "/app/config/config.php";
 include __DIR__ . "/../app/config/loader.php";
 
 
-$di = new FactoryDefault();
-Di::reset();
-
-$di->set('config', $config);
-
-Di::setDefault($di);