mvc: fix Phalcon 5.4 and up

See also: phalcon/cphalcon#16460
opnsense · Mar 12, 2024 · 7dde119 · 7dde119
1 parent 519f4cb
commit 7dde119
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git 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
@@ -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