From 1fd6689f6d1d513e12f11d69f60277c9b92bda13 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 12 Feb 2024 14:45:53 +0100
Subject: [PATCH] mvc: fix Phalcon 5.4 and up

See also: https://github.com/phalcon/cphalcon/issues/16460

(cherry picked from commit 5f855524e34951481372109aa3605eca24916755)
---
 src/opnsense/mvc/app/config/services.php     | 8 +++++---
 src/opnsense/mvc/app/config/services_api.php | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/opnsense/mvc/app/config/services.php b/src/opnsense/mvc/app/config/services.php
index 53460243835..be571dc6358 100644
--- a/src/opnsense/mvc/app/config/services.php
+++ b/src/opnsense/mvc/app/config/services.php
@@ -101,8 +101,10 @@
 /**
  * Setup router
  */
-$di->set('router', function () use ($config) {
+$di->set('router', function () use ($config, $di) {
     $routing = new Routing($config->application->controllersDir, "ui");
-    $routing->getRouter()->handle($_SERVER['REQUEST_URI']);
-    return $routing->getRouter();
+    $router = $routing->getRouter();
+    $router->setDI($di);
+    $router->handle($_SERVER['REQUEST_URI']);
+    return $router;
 });
diff --git a/src/opnsense/mvc/app/config/services_api.php b/src/opnsense/mvc/app/config/services_api.php
index f1106d0ff0c..e00577ad1bc 100644
--- a/src/opnsense/mvc/app/config/services_api.php
+++ b/src/opnsense/mvc/app/config/services_api.php
@@ -87,10 +87,12 @@
 /**
  * Setup router
  */
-$di->set('router', function () use ($config) {
+$di->set('router', function () use ($config, $di) {
     $routing = new Routing($config->application->controllersDir, "api");
-    $routing->getRouter()->handle($_SERVER['REQUEST_URI']);
-    return $routing->getRouter();
+    $router = $routing->getRouter();
+    $router->setDI($di);
+    $router->handle($_SERVER['REQUEST_URI']);
+    return $router;
 });
 
 // exception handling