From e81d2f9af0af00ccd8536a9170457385ed109959 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Mon, 30 Apr 2018 10:26:00 +0200
Subject: [PATCH] Utilize Icinga\Web\Menu instead of
 Icinga\Application\Web::getMenu()

refs #2338
---
 application/controllers/LayoutController.php       | 4 ++--
 application/controllers/NavigationController.php   | 4 ++--
 application/layouts/scripts/parts/navigation.phtml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/controllers/LayoutController.php b/application/controllers/LayoutController.php
index 32295a688..237681cfa 100644
--- a/application/controllers/LayoutController.php
+++ b/application/controllers/LayoutController.php
@@ -3,8 +3,8 @@
 
 namespace Icinga\Controllers;
 
-use Icinga\Application\Icinga;
 use Icinga\Web\Controller\ActionController;
+use Icinga\Web\Menu;
 
 /**
  * Create complex layout parts
@@ -18,7 +18,7 @@ class LayoutController extends ActionController
     {
         $this->setAutorefreshInterval(15);
         $this->_helper->layout()->disableLayout();
-        $this->view->menuRenderer = Icinga::app()->getMenu()->getRenderer();
+        $this->view->menuRenderer = (new Menu())->getRenderer();
     }
 
     public function announcementsAction()
diff --git a/application/controllers/NavigationController.php b/application/controllers/NavigationController.php
index 67c249a33..aa1b7a95d 100644
--- a/application/controllers/NavigationController.php
+++ b/application/controllers/NavigationController.php
@@ -5,7 +5,6 @@ namespace Icinga\Controllers;
 
 use Exception;
 use Icinga\Application\Config;
-use Icinga\Application\Icinga;
 use Icinga\Exception\NotFoundError;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Data\Filter\FilterMatchCaseInsensitive;
@@ -13,6 +12,7 @@ use Icinga\Forms\ConfirmRemovalForm;
 use Icinga\Forms\Navigation\NavigationConfigForm;
 use Icinga\Web\Controller;
 use Icinga\Web\Form;
+use Icinga\Web\Menu;
 use Icinga\Web\Navigation\Navigation;
 use Icinga\Web\Notification;
 use Icinga\Web\Url;
@@ -419,7 +419,7 @@ class NavigationController extends Controller
             'url'       => Url::fromRequest()
         ));
 
-        $menu = Icinga::app()->getMenu();
+        $menu = new Menu();
 
         $navigation = $menu->findItem($name);
 
diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index c0eca8cf9..edb0d8fbc 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -1,6 +1,6 @@
 <?php
 
-use Icinga\Application\Icinga;
+use Icinga\Web\Menu;
 
 // Don't render a menu for unauthenticated users unless menu is auth aware
 if (! $this->auth()->isAuthenticated()) {
@@ -26,7 +26,7 @@ if (! $this->auth()->isAuthenticated()) {
             'layout/menu.phtml',
             'default',
             array(
-                'menuRenderer' => Icinga::app()->getMenu()->getRenderer()->setUseStandardItemRenderer()
+                'menuRenderer' => (new Menu())->getRenderer()->setUseStandardItemRenderer()
             )
         ) ?>
     </div>