From 652c55a5ef522c0267591360cddcd7b48166d8bf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sun, 12 Jul 2020 17:40:19 -0300
Subject: [PATCH] Remove Config\PageSettings::getNaviSettings method
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Related to https://github.com/phpmyadmin/phpmyadmin/issues/16258.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 libraries/classes/Config/PageSettings.php              | 15 ---------------
 libraries/classes/Controllers/NavigationController.php |  4 +++-
 libraries/classes/Navigation/Navigation.php            |  4 +++-
 test/classes/Config/PageSettingsTest.php               |  4 +++-
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/libraries/classes/Config/PageSettings.php b/libraries/classes/Config/PageSettings.php
index 39dee32490..9d02bd1a2e 100644
--- a/libraries/classes/Config/PageSettings.php
+++ b/libraries/classes/Config/PageSettings.php
@@ -196,19 +196,4 @@ class PageSettings
     {
         return $this->_errorHTML;
     }
-
-    /**
-     * Get HTML for navigation settings
-     *
-     * @return string
-     */
-    public static function getNaviSettings()
-    {
-        $object = new PageSettings('Navi', 'pma_navigation_settings');
-
-        $response = Response::getInstance();
-        $response->addHTML($object->getErrorHTML());
-
-        return $object->getHTML();
-    }
 }
diff --git a/libraries/classes/Controllers/NavigationController.php b/libraries/classes/Controllers/NavigationController.php
index dea755b179..a060dfc95a 100644
--- a/libraries/classes/Controllers/NavigationController.php
+++ b/libraries/classes/Controllers/NavigationController.php
@@ -58,7 +58,9 @@ class NavigationController extends AbstractController
         }
 
         if (isset($_POST['getNaviSettings']) && $_POST['getNaviSettings']) {
-            $this->response->addJSON('message', PageSettings::getNaviSettings());
+            $pageSettings = new PageSettings('Navi', 'pma_navigation_settings');
+            $this->response->addHTML($pageSettings->getErrorHTML());
+            $this->response->addJSON('message', $pageSettings->getHTML());
 
             return;
         }
diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php
index aa6f412c9a..e1d35ff917 100644
--- a/libraries/classes/Navigation/Navigation.php
+++ b/libraries/classes/Navigation/Navigation.php
@@ -98,7 +98,9 @@ class Navigation
             }
 
             if (! defined('PMA_DISABLE_NAVI_SETTINGS')) {
-                $navigationSettings = PageSettings::getNaviSettings();
+                $pageSettings = new PageSettings('Navi', 'pma_navigation_settings');
+                $response->addHTML($pageSettings->getErrorHTML());
+                $navigationSettings = $pageSettings->getHTML();
             }
         }
         if (! $response->isAjax()
diff --git a/test/classes/Config/PageSettingsTest.php b/test/classes/Config/PageSettingsTest.php
index 4cee6cd29a..3dc7828f8a 100644
--- a/test/classes/Config/PageSettingsTest.php
+++ b/test/classes/Config/PageSettingsTest.php
@@ -79,7 +79,9 @@ class PageSettingsTest extends AbstractTestCase
      */
     public function testGetNaviSettings(): void
     {
-        $html = PageSettings::getNaviSettings();
+        $pageSettings = new PageSettings('Navi', 'pma_navigation_settings');
+
+        $html = $pageSettings->getHTML();
 
         // Test some sample parts
         $this->assertStringContainsString(
-- 
2.11.4.GIT