From ae625702f1a76333e39b8ee8d023d6d0ce769e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Fri, 10 May 2024 14:20:44 -0300
Subject: [PATCH 1/9] Refactor Routing::callSetupController() to use
 ContainerBuilder
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Uses the ContainerBuilder to factory the setup controllers.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 app/services_controllers.php                  | 13 +++++
 psalm-baseline.xml                            | 14 ++++-
 .../Setup/ShowConfigController.php            | 26 ++++++----
 src/Routing/Routing.php                       | 51 +++++++++----------
 tests/unit/Routing/RoutingTest.php            | 31 ++++++++++-
 5 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/app/services_controllers.php b/app/services_controllers.php
index 6b21dd9851..d8983f7e2a 100644
--- a/app/services_controllers.php
+++ b/app/services_controllers.php
@@ -29,6 +29,7 @@ use PhpMyAdmin\Controllers\PhpInfoController;
 use PhpMyAdmin\Controllers\Preferences;
 use PhpMyAdmin\Controllers\SchemaExportController;
 use PhpMyAdmin\Controllers\Server;
+use PhpMyAdmin\Controllers\Setup;
 use PhpMyAdmin\Controllers\Sql;
 use PhpMyAdmin\Controllers\Table;
 use PhpMyAdmin\Controllers\TableController;
@@ -866,6 +867,18 @@ return [
             'class' => Server\VariablesController::class,
             'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
+        Setup\MainController::class => [
+            'class' => Setup\MainController::class,
+            'arguments' => ['@' . ResponseFactory::class, '@template', '@console'],
+        ],
+        Setup\ShowConfigController::class => [
+            'class' => Setup\ShowConfigController::class,
+            'arguments' => ['@response'],
+        ],
+        Setup\ValidateController::class => [
+            'class' => Setup\ValidateController::class,
+            'arguments' => ['@' . ResponseFactory::class],
+        ],
         Sql\ColumnPreferencesController::class => [
             'class' => Sql\ColumnPreferencesController::class,
             'arguments' => ['$response' => '@response', '$dbi' => '@dbi'],
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 97b17b59f4..2888fb0074 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -3029,6 +3029,19 @@
     <DeprecatedMethod>
       <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
+    <PossiblyUnusedMethod>
+      <code><![CDATA[__construct]]></code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="src/Controllers/Setup/ShowConfigController.php">
+    <PossiblyUnusedMethod>
+      <code><![CDATA[__construct]]></code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="src/Controllers/Setup/ValidateController.php">
+    <PossiblyUnusedMethod>
+      <code><![CDATA[__construct]]></code>
+    </PossiblyUnusedMethod>
   </file>
   <file src="src/Controllers/Sql/ColumnPreferencesController.php">
     <MixedAssignment>
@@ -10221,7 +10234,6 @@
   <file src="src/Routing/Routing.php">
     <DeprecatedMethod>
       <code><![CDATA[Config::getInstance()]]></code>
-      <code><![CDATA[DatabaseInterface::getInstance()]]></code>
     </DeprecatedMethod>
     <MixedArrayAccess>
       <code><![CDATA[$dispatchData[0]['GET']['/']]]></code>
diff --git a/src/Controllers/Setup/ShowConfigController.php b/src/Controllers/Setup/ShowConfigController.php
index 9a6fe7f535..0d652bb1ef 100644
--- a/src/Controllers/Setup/ShowConfigController.php
+++ b/src/Controllers/Setup/ShowConfigController.php
@@ -18,13 +18,16 @@ use function is_string;
 
 final class ShowConfigController implements InvocableController
 {
+    public function __construct(private readonly ResponseRenderer $responseRenderer)
+    {
+    }
+
     public function __invoke(ServerRequest $request): Response
     {
         $formDisplay = new ConfigForm($GLOBALS['ConfigFile']);
         $formDisplay->save(['Config']);
 
-        $response = ResponseRenderer::getInstance();
-        $response->disable();
+        $this->responseRenderer->disable();
 
         /** @var mixed $eol */
         $eol = $request->getParsedBodyParam('eol');
@@ -38,10 +41,13 @@ final class ShowConfigController implements InvocableController
             // Clear current config and return to main page
             $GLOBALS['ConfigFile']->resetConfigData();
             // drop post data
-            $response->addHeader('Location', '../setup/index.php' . Url::getCommonRaw(['route' => '/setup']));
-            $response->setStatusCode(StatusCodeInterface::STATUS_SEE_OTHER);
+            $this->responseRenderer->addHeader(
+                'Location',
+                '../setup/index.php' . Url::getCommonRaw(['route' => '/setup']),
+            );
+            $this->responseRenderer->setStatusCode(StatusCodeInterface::STATUS_SEE_OTHER);
 
-            return $response->response();
+            return $this->responseRenderer->response();
         }
 
         /** @var mixed $submitDownload */
@@ -49,19 +55,19 @@ final class ShowConfigController implements InvocableController
         if (is_string($submitDownload) && $submitDownload !== '') {
             // Output generated config file
             Core::downloadHeader('config.inc.php', 'text/plain');
-            $response->disable();
+            $this->responseRenderer->disable();
             echo ConfigGenerator::getConfigFile($GLOBALS['ConfigFile']);
 
-            return $response->response();
+            return $this->responseRenderer->response();
         }
 
         // Show generated config file in a <textarea>
-        $response->addHeader(
+        $this->responseRenderer->addHeader(
             'Location',
             '../setup/index.php' . Url::getCommonRaw(['route' => '/setup', 'page' => 'config']),
         );
-        $response->setStatusCode(StatusCodeInterface::STATUS_SEE_OTHER);
+        $this->responseRenderer->setStatusCode(StatusCodeInterface::STATUS_SEE_OTHER);
 
-        return $response->response();
+        return $this->responseRenderer->response();
     }
 }
diff --git a/src/Routing/Routing.php b/src/Routing/Routing.php
index e2abca08b2..fa072bcc44 100644
--- a/src/Routing/Routing.php
+++ b/src/Routing/Routing.php
@@ -10,17 +10,14 @@ use FastRoute\Dispatcher\GroupCountBased as DispatcherGroupCountBased;
 use FastRoute\RouteCollector;
 use FastRoute\RouteParser\Std as RouteParserStd;
 use Fig\Http\Message\StatusCodeInterface;
-use PhpMyAdmin\Bookmarks\BookmarkRepository;
 use PhpMyAdmin\Config;
-use PhpMyAdmin\ConfigStorage\Relation;
-use PhpMyAdmin\Console;
+use PhpMyAdmin\Container\ContainerBuilder;
 use PhpMyAdmin\Controllers\HomeController;
 use PhpMyAdmin\Controllers\InvocableController;
 use PhpMyAdmin\Controllers\Setup\MainController;
 use PhpMyAdmin\Controllers\Setup\ShowConfigController;
 use PhpMyAdmin\Controllers\Setup\ValidateController;
 use PhpMyAdmin\Core;
-use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Http\Factory\ResponseFactory;
 use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
@@ -190,33 +187,33 @@ class Routing
     public static function callSetupController(ServerRequest $request, ResponseFactory $responseFactory): Response
     {
         $route = $request->getRoute();
-        $template = new Template();
-        if ($route === '/setup' || $route === '/') {
-            $dbi = DatabaseInterface::getInstance();
-            $relation = new Relation($dbi);
-            $console = new Console($relation, $template, new BookmarkRepository($dbi, $relation));
+        $controllerName = match ($route) {
+            '/', '/setup' => MainController::class,
+            '/setup/show-config' => ShowConfigController::class,
+            '/setup/validate' => ValidateController::class,
+            default => null,
+        };
 
-            return (new MainController($responseFactory, $template, $console))($request);
+        $container = ContainerBuilder::getContainer();
+        if ($controllerName === null) {
+            $template = $container->get('template');
+            assert($template instanceof Template);
+            $response = $responseFactory->createResponse(StatusCodeInterface::STATUS_NOT_FOUND);
+
+            return $response->write($template->render('error/generic', [
+                'lang' => $GLOBALS['lang'] ?? 'en',
+                'dir' => LanguageManager::$textDir,
+                'error_message' => Sanitize::convertBBCode(sprintf(
+                    __('Error 404! The page %s was not found.'),
+                    '[code]' . htmlspecialchars($route) . '[/code]',
+                )),
+            ]));
         }
 
-        if ($route === '/setup/show-config') {
-            return (new ShowConfigController())($request);
-        }
+        $controller = $container->get($controllerName);
+        assert($controller instanceof $controllerName);
 
-        if ($route === '/setup/validate') {
-            return (new ValidateController($responseFactory))($request);
-        }
-
-        $response = $responseFactory->createResponse(StatusCodeInterface::STATUS_NOT_FOUND);
-
-        return $response->write($template->render('error/generic', [
-            'lang' => $GLOBALS['lang'] ?? 'en',
-            'dir' => LanguageManager::$textDir,
-            'error_message' => Sanitize::convertBBCode(sprintf(
-                __('Error 404! The page %s was not found.'),
-                '[code]' . htmlspecialchars($route) . '[/code]',
-            )),
-        ]));
+        return $controller($request);
     }
 
     /**
diff --git a/tests/unit/Routing/RoutingTest.php b/tests/unit/Routing/RoutingTest.php
index 34012be2bf..e1574dcede 100644
--- a/tests/unit/Routing/RoutingTest.php
+++ b/tests/unit/Routing/RoutingTest.php
@@ -5,12 +5,18 @@ declare(strict_types=1);
 namespace PhpMyAdmin\Tests\Routing;
 
 use FastRoute\Dispatcher;
+use Fig\Http\Message\StatusCodeInterface;
 use PhpMyAdmin\Config;
+use PhpMyAdmin\Container\ContainerBuilder;
 use PhpMyAdmin\Controllers\HomeController;
+use PhpMyAdmin\Http\Factory\ResponseFactory;
+use PhpMyAdmin\Http\Factory\ServerRequestFactory;
 use PhpMyAdmin\Routing\Routing;
+use PhpMyAdmin\Template;
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
+use Psr\Container\ContainerInterface;
 
 use function copy;
 use function unlink;
@@ -19,7 +25,7 @@ use const CACHE_DIR;
 use const TEST_PATH;
 
 #[CoversClass(Routing::class)]
-class RoutingTest extends AbstractTestCase
+final class RoutingTest extends AbstractTestCase
 {
     /**
      * Test for Routing::getDispatcher
@@ -97,4 +103,27 @@ class RoutingTest extends AbstractTestCase
             ['', '/phpmyadmin/index.php', '', '/phpmyadmin/index.php'],
         ];
     }
+
+    public function testCallSetupControllerWithInvalidRoute(): void
+    {
+        $template = new Template();
+        $container = self::createStub(ContainerInterface::class);
+        $container->method('get')->willReturn($template);
+        ContainerBuilder::$container = $container;
+
+        $request = ServerRequestFactory::create()->createServerRequest('GET', 'https://example.com/')
+            ->withAttribute('route', '/setup/invalid-route');
+        $response = Routing::callSetupController($request, ResponseFactory::create());
+
+        $expected = $template->render('error/generic', [
+            'lang' => 'en',
+            'dir' => 'ltr',
+            'error_message' => 'Error 404! The page <code>/setup/invalid-route</code> was not found.',
+        ]);
+
+        self::assertSame(StatusCodeInterface::STATUS_NOT_FOUND, $response->getStatusCode());
+        self::assertSame($expected, (string) $response->getBody());
+
+        ContainerBuilder::$container = null;
+    }
 }

From 9cac3a9bcc60b6c65ff0beaf7e077a729db73cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Fri, 10 May 2024 16:35:44 -0300
Subject: [PATCH 2/9] Pass ServerRequest object directly to setup controllers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of passing an array of parameters.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 src/Controllers/Setup/ConfigController.php  | 26 ++++++-----
 src/Controllers/Setup/FormController.php    | 19 ++++----
 src/Controllers/Setup/HomeController.php    | 19 ++++----
 src/Controllers/Setup/MainController.php    | 26 +++--------
 src/Controllers/Setup/ServersController.php | 48 +++++++++++++--------
 5 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/src/Controllers/Setup/ConfigController.php b/src/Controllers/Setup/ConfigController.php
index 926c500afa..2a7078d973 100644
--- a/src/Controllers/Setup/ConfigController.php
+++ b/src/Controllers/Setup/ConfigController.php
@@ -4,22 +4,15 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Setup;
 
+use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\Setup\ConfigGenerator;
 
 use function is_string;
 
 class ConfigController extends AbstractController
 {
-    /**
-     * @param mixed[] $params Request parameters
-     *
-     * @return string HTML
-     */
-    public function __invoke(array $params): string
+    public function __invoke(ServerRequest $request): string
     {
-        $formset = isset($params['formset']) && is_string($params['formset']) ? $params['formset'] : '';
-        $eol = isset($params['eol']) && $params['eol'] === 'win' ? 'win' : 'unix';
-
         $pages = $this->getPages();
 
         static $hasCheckPageRefresh = false;
@@ -30,11 +23,22 @@ class ConfigController extends AbstractController
         $config = ConfigGenerator::getConfigFile($this->config);
 
         return $this->template->render('setup/config/index', [
-            'formset' => $formset,
+            'formset' => $this->getFormSetParam($request->getQueryParam('formset')),
             'pages' => $pages,
-            'eol' => $eol,
+            'eol' => $this->getEolParam($request->getQueryParam('eol')),
             'config' => $config,
             'has_check_page_refresh' => $hasCheckPageRefresh,
         ]);
     }
+
+    private function getFormSetParam(mixed $formSetParam): string
+    {
+        return is_string($formSetParam) ? $formSetParam : '';
+    }
+
+    /** @psalm-return 'win'|'unix' */
+    private function getEolParam(mixed $eolParam): string
+    {
+        return $eolParam === 'win' ? 'win' : 'unix';
+    }
 }
diff --git a/src/Controllers/Setup/FormController.php b/src/Controllers/Setup/FormController.php
index e21314805e..3cbedd762f 100644
--- a/src/Controllers/Setup/FormController.php
+++ b/src/Controllers/Setup/FormController.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace PhpMyAdmin\Controllers\Setup;
 
 use PhpMyAdmin\Config\Forms\Setup\SetupFormList;
+use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Setup\FormProcessing;
 
@@ -15,18 +16,13 @@ use function ob_start;
 
 class FormController extends AbstractController
 {
-    /**
-     * @param mixed[] $params Request parameters
-     *
-     * @return string HTML
-     */
-    public function __invoke(array $params): string
+    public function __invoke(ServerRequest $request): string
     {
         $pages = $this->getPages();
 
-        $formset = isset($params['formset']) && is_string($params['formset']) ? $params['formset'] : '';
+        $formSet = $this->getFormSetParam($request->getQueryParam('formset'));
 
-        $formClass = SetupFormList::get($formset);
+        $formClass = SetupFormList::get($formSet);
         if ($formClass === null) {
             return $this->template->render('error/generic', [
                 'lang' => $GLOBALS['lang'] ?? 'en',
@@ -41,10 +37,15 @@ class FormController extends AbstractController
         $page = ob_get_clean();
 
         return $this->template->render('setup/form/index', [
-            'formset' => $formset,
+            'formset' => $formSet,
             'pages' => $pages,
             'name' => $form::getName(),
             'page' => $page,
         ]);
     }
+
+    private function getFormSetParam(mixed $formSetParam): string
+    {
+        return is_string($formSetParam) ? $formSetParam : '';
+    }
 }
diff --git a/src/Controllers/Setup/HomeController.php b/src/Controllers/Setup/HomeController.php
index 4866bd8299..be6d07ac5c 100644
--- a/src/Controllers/Setup/HomeController.php
+++ b/src/Controllers/Setup/HomeController.php
@@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Setup;
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\ServerConfigChecks;
+use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Setup\Index;
 
@@ -16,22 +17,15 @@ use function is_string;
 
 class HomeController extends AbstractController
 {
-    /**
-     * @param mixed[] $params Request parameters
-     *
-     * @return string HTML
-     */
-    public function __invoke(array $params): string
+    public function __invoke(ServerRequest $request): string
     {
-        $formset = isset($params['formset']) && is_string($params['formset']) ? $params['formset'] : '';
-
         $pages = $this->getPages();
 
         // message handling
         Index::messagesBegin();
 
         // Check phpMyAdmin version
-        if (isset($params['version_check'])) {
+        if ($request->hasQueryParam('version_check')) {
             Index::versionCheck();
         }
 
@@ -86,7 +80,7 @@ class HomeController extends AbstractController
         }
 
         return $this->template->render('setup/home/index', [
-            'formset' => $formset,
+            'formset' => $this->getFormSetParam($request->getQueryParam('formset')),
             'languages' => $languages,
             'messages' => $messages,
             'server_count' => $this->config->getServerCount(),
@@ -98,4 +92,9 @@ class HomeController extends AbstractController
                 : (Config::getInstance()->get('PMA_IS_WINDOWS') ? 'win' : 'unix'),
         ]);
     }
+
+    private function getFormSetParam(mixed $formSetParam): string
+    {
+        return is_string($formSetParam) ? $formSetParam : '';
+    }
 }
diff --git a/src/Controllers/Setup/MainController.php b/src/Controllers/Setup/MainController.php
index 71bc2703ff..17e47b44f1 100644
--- a/src/Controllers/Setup/MainController.php
+++ b/src/Controllers/Setup/MainController.php
@@ -56,24 +56,17 @@ final class MainController implements InvocableController
         }
 
         if ($page === 'form') {
-            return $response->write((new FormController($GLOBALS['ConfigFile'], $this->template))([
-                'formset' => $request->getQueryParam('formset'),
-            ]));
+            return $response->write((new FormController($GLOBALS['ConfigFile'], $this->template))($request));
         }
 
         if ($page === 'config') {
-            return $response->write((new ConfigController($GLOBALS['ConfigFile'], $this->template))([
-                'formset' => $request->getQueryParam('formset'),
-                'eol' => $request->getQueryParam('eol'),
-            ]));
+            return $response->write((new ConfigController($GLOBALS['ConfigFile'], $this->template))($request));
         }
 
         if ($page === 'servers') {
             $controller = new ServersController($GLOBALS['ConfigFile'], $this->template);
-            /** @var mixed $mode */
-            $mode = $request->getQueryParam('mode');
-            if ($mode === 'remove' && $request->isPost()) {
-                $controller->destroy(['id' => $request->getQueryParam('id')]);
+            if ($request->getQueryParam('mode') === 'remove' && $request->isPost()) {
+                $controller->destroy($request);
                 $response = $response->withStatus(StatusCodeInterface::STATUS_FOUND);
 
                 return $response->withHeader(
@@ -82,16 +75,9 @@ final class MainController implements InvocableController
                 );
             }
 
-            return $response->write($controller->index([
-                'formset' => $request->getQueryParam('formset'),
-                'mode' => $mode,
-                'id' => $request->getQueryParam('id'),
-            ]));
+            return $response->write($controller->index($request));
         }
 
-        return $response->write((new HomeController($GLOBALS['ConfigFile'], $this->template))([
-            'formset' => $request->getQueryParam('formset'),
-            'version_check' => $request->getQueryParam('version_check'),
-        ]));
+        return $response->write((new HomeController($GLOBALS['ConfigFile'], $this->template))($request));
     }
 }
diff --git a/src/Controllers/Setup/ServersController.php b/src/Controllers/Setup/ServersController.php
index a935596496..a47ff27e91 100644
--- a/src/Controllers/Setup/ServersController.php
+++ b/src/Controllers/Setup/ServersController.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace PhpMyAdmin\Controllers\Setup;
 
 use PhpMyAdmin\Config\Forms\Setup\ServersForm;
+use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\Setup\FormProcessing;
 
 use function in_array;
@@ -15,19 +16,10 @@ use function ob_start;
 
 class ServersController extends AbstractController
 {
-    /**
-     * @param mixed[] $params Request parameters
-     *
-     * @return string HTML
-     */
-    public function index(array $params): string
+    public function index(ServerRequest $request): string
     {
-        $formset = isset($params['formset']) && is_string($params['formset']) ? $params['formset'] : '';
-        $id = isset($params['id']) && is_numeric($params['id']) && (int) $params['id'] >= 1 ? (int) $params['id'] : 0;
-        $mode = '';
-        if (isset($params['mode']) && in_array($params['mode'], ['add', 'edit', 'revert'], true)) {
-            $mode = $params['mode'];
-        }
+        $id = $this->getIdParam($request->getQueryParam('id'));
+        $mode = $this->getModeParam($request->getQueryParam('mode'));
 
         $pages = $this->getPages();
 
@@ -42,7 +34,7 @@ class ServersController extends AbstractController
         $page = ob_get_clean();
 
         return $this->template->render('setup/servers/index', [
-            'formset' => $formset,
+            'formset' => $this->getFormSetParam($request->getQueryParam('formset')),
             'pages' => $pages,
             'has_server' => $hasServer,
             'mode' => $mode,
@@ -52,17 +44,37 @@ class ServersController extends AbstractController
         ]);
     }
 
-    /** @param mixed[] $params Request parameters */
-    public function destroy(array $params): void
+    public function destroy(ServerRequest $request): void
     {
-        $id = isset($params['id']) && is_numeric($params['id']) && (int) $params['id'] >= 1 ? (int) $params['id'] : 0;
-
+        $id = $this->getIdParam($request->getQueryParam('id'));
         $hasServer = $id >= 1 && $this->config->get('Servers/' . $id) !== null;
-
         if (! $hasServer) {
             return;
         }
 
         $this->config->removeServer($id);
     }
+
+    private function getFormSetParam(mixed $formSetParam): string
+    {
+        return is_string($formSetParam) ? $formSetParam : '';
+    }
+
+    /** @psalm-return 'add'|'edit'|'revert'|'' */
+    private function getModeParam(mixed $modeParam): string
+    {
+        return in_array($modeParam, ['add', 'edit', 'revert'], true) ? $modeParam : '';
+    }
+
+    /** @psalm-return int<0, max> */
+    private function getIdParam(mixed $idParam): int
+    {
+        if (! is_numeric($idParam)) {
+            return 0;
+        }
+
+        $id = (int) $idParam;
+
+        return $id >= 1 ? $id : 0;
+    }
 }

From 2fe67cc85b406caadaf079525c8686ac6043ee50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Fri, 10 May 2024 16:53:18 -0300
Subject: [PATCH 3/9] Extract destroy action from Setup\ServersController
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extracts it into a new controller called Setup\ServerDestroyController.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 phpstan-baseline.neon                         |  5 +++
 src/Controllers/Setup/MainController.php      |  5 ++-
 .../Setup/ServerDestroyController.php         | 35 +++++++++++++++++++
 src/Controllers/Setup/ServersController.php   | 13 +------
 4 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 src/Controllers/Setup/ServerDestroyController.php

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index f857319b5b..a27ee53311 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -3780,6 +3780,11 @@ parameters:
 			count: 1
 			path: src/Controllers/Setup/MainController.php
 
+		-
+			message: "#^Parameter \\#1 \\$config of class PhpMyAdmin\\\\Controllers\\\\Setup\\\\ServerDestroyController constructor expects PhpMyAdmin\\\\Config\\\\ConfigFile, mixed given\\.$#"
+			count: 1
+			path: src/Controllers/Setup/MainController.php
+
 		-
 			message: "#^Parameter \\#1 \\$config of class PhpMyAdmin\\\\Controllers\\\\Setup\\\\ServersController constructor expects PhpMyAdmin\\\\Config\\\\ConfigFile, mixed given\\.$#"
 			count: 1
diff --git a/src/Controllers/Setup/MainController.php b/src/Controllers/Setup/MainController.php
index 17e47b44f1..3454835106 100644
--- a/src/Controllers/Setup/MainController.php
+++ b/src/Controllers/Setup/MainController.php
@@ -64,9 +64,8 @@ final class MainController implements InvocableController
         }
 
         if ($page === 'servers') {
-            $controller = new ServersController($GLOBALS['ConfigFile'], $this->template);
             if ($request->getQueryParam('mode') === 'remove' && $request->isPost()) {
-                $controller->destroy($request);
+                (new ServerDestroyController($GLOBALS['ConfigFile'], $this->template))($request);
                 $response = $response->withStatus(StatusCodeInterface::STATUS_FOUND);
 
                 return $response->withHeader(
@@ -75,7 +74,7 @@ final class MainController implements InvocableController
                 );
             }
 
-            return $response->write($controller->index($request));
+            return $response->write((new ServersController($GLOBALS['ConfigFile'], $this->template))($request));
         }
 
         return $response->write((new HomeController($GLOBALS['ConfigFile'], $this->template))($request));
diff --git a/src/Controllers/Setup/ServerDestroyController.php b/src/Controllers/Setup/ServerDestroyController.php
new file mode 100644
index 0000000000..8b29faf388
--- /dev/null
+++ b/src/Controllers/Setup/ServerDestroyController.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Controllers\Setup;
+
+use PhpMyAdmin\Http\ServerRequest;
+
+use function is_numeric;
+
+class ServerDestroyController extends AbstractController
+{
+    public function __invoke(ServerRequest $request): void
+    {
+        $id = $this->getIdParam($request->getQueryParam('id'));
+        $hasServer = $id >= 1 && $this->config->get('Servers/' . $id) !== null;
+        if (! $hasServer) {
+            return;
+        }
+
+        $this->config->removeServer($id);
+    }
+
+    /** @psalm-return int<0, max> */
+    private function getIdParam(mixed $idParam): int
+    {
+        if (! is_numeric($idParam)) {
+            return 0;
+        }
+
+        $id = (int) $idParam;
+
+        return $id >= 1 ? $id : 0;
+    }
+}
diff --git a/src/Controllers/Setup/ServersController.php b/src/Controllers/Setup/ServersController.php
index a47ff27e91..e144c61983 100644
--- a/src/Controllers/Setup/ServersController.php
+++ b/src/Controllers/Setup/ServersController.php
@@ -16,7 +16,7 @@ use function ob_start;
 
 class ServersController extends AbstractController
 {
-    public function index(ServerRequest $request): string
+    public function __invoke(ServerRequest $request): string
     {
         $id = $this->getIdParam($request->getQueryParam('id'));
         $mode = $this->getModeParam($request->getQueryParam('mode'));
@@ -44,17 +44,6 @@ class ServersController extends AbstractController
         ]);
     }
 
-    public function destroy(ServerRequest $request): void
-    {
-        $id = $this->getIdParam($request->getQueryParam('id'));
-        $hasServer = $id >= 1 && $this->config->get('Servers/' . $id) !== null;
-        if (! $hasServer) {
-            return;
-        }
-
-        $this->config->removeServer($id);
-    }
-
     private function getFormSetParam(mixed $formSetParam): string
     {
         return is_string($formSetParam) ? $formSetParam : '';

From 52b3ef44959127a30830b0d3e95b171fbbc0611a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Fri, 10 May 2024 21:16:33 -0300
Subject: [PATCH 4/9] Remove Config\ConfigFile global variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Removes the 'cf' and 'ConfigFile' global variables.
- Extracts the ConfigFile creation from SetupPageRedirection middleware
and moves it to the Setup\SetupHelper class.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 phpstan-baseline.neon                         | 147 +-----------------
 psalm-baseline.xml                            |  14 --
 psalm.xml                                     |   1 -
 src/Config/PageSettings.php                   |   8 +-
 .../Preferences/ExportController.php          |   9 +-
 .../Preferences/FeaturesController.php        |   9 +-
 .../Preferences/ImportController.php          |   9 +-
 .../Preferences/MainPanelController.php       |   9 +-
 .../Preferences/ManageController.php          |  15 +-
 .../Preferences/NavigationController.php      |   9 +-
 src/Controllers/Preferences/SqlController.php |   9 +-
 src/Controllers/Setup/AbstractController.php  |   3 +-
 src/Controllers/Setup/ConfigController.php    |   5 +-
 src/Controllers/Setup/FormController.php      |   5 +-
 src/Controllers/Setup/HomeController.php      |  15 +-
 src/Controllers/Setup/MainController.php      |  10 +-
 .../Setup/ServerDestroyController.php         |   7 +-
 src/Controllers/Setup/ServersController.php   |   9 +-
 .../Setup/ShowConfigController.php            |   9 +-
 src/Controllers/Setup/ValidateController.php  |   5 +-
 src/Http/Middleware/SetupPageRedirection.php  |  16 --
 src/Setup/SetupHelper.php                     |  30 ++++
 tests/unit/Config/ServerConfigChecksTest.php  |  15 +-
 tests/unit/Setup/SetupHelperTest.php          |  34 ++++
 24 files changed, 152 insertions(+), 250 deletions(-)
 create mode 100644 src/Setup/SetupHelper.php
 create mode 100644 tests/unit/Setup/SetupHelperTest.php

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index a27ee53311..cd0c8989b0 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -3025,81 +3025,26 @@ parameters:
 			count: 1
 			path: src/Controllers/Operations/ViewController.php
 
-		-
-			message: "#^Cannot call method getConfigArray\\(\\) on mixed\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/ExportController.php
-
-		-
-			message: "#^Parameter \\#1 \\$configArray of method PhpMyAdmin\\\\UserPreferences\\:\\:save\\(\\) expects array, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/ExportController.php
-
 		-
 			message: "#^Parameter \\#1 \\$string of function ltrim expects string, mixed given\\.$#"
 			count: 1
 			path: src/Controllers/Preferences/ExportController.php
 
-		-
-			message: "#^Cannot call method getConfigArray\\(\\) on mixed\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/FeaturesController.php
-
-		-
-			message: "#^Parameter \\#1 \\$configArray of method PhpMyAdmin\\\\UserPreferences\\:\\:save\\(\\) expects array, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/FeaturesController.php
-
 		-
 			message: "#^Parameter \\#1 \\$string of function ltrim expects string, mixed given\\.$#"
 			count: 1
 			path: src/Controllers/Preferences/FeaturesController.php
 
 		-
-			message: "#^Cannot call method getConfigArray\\(\\) on mixed\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/ImportController.php
-
-		-
-			message: "#^Parameter \\#1 \\$configArray of method PhpMyAdmin\\\\UserPreferences\\:\\:save\\(\\) expects array, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$string of function ltrim expects string, mixed given\\.$#"
 			count: 1
 			path: src/Controllers/Preferences/ImportController.php
 
 		-
 			message: "#^Parameter \\#1 \\$string of function ltrim expects string, mixed given\\.$#"
 			count: 1
-			path: src/Controllers/Preferences/ImportController.php
-
-		-
-			message: "#^Cannot call method getConfigArray\\(\\) on mixed\\.$#"
-			count: 1
 			path: src/Controllers/Preferences/MainPanelController.php
 
-		-
-			message: "#^Parameter \\#1 \\$configArray of method PhpMyAdmin\\\\UserPreferences\\:\\:save\\(\\) expects array, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/MainPanelController.php
-
-		-
-			message: "#^Parameter \\#1 \\$string of function ltrim expects string, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/MainPanelController.php
-
-		-
-			message: "#^Cannot call method getConfigArray\\(\\) on mixed\\.$#"
-			count: 2
-			path: src/Controllers/Preferences/ManageController.php
-
-		-
-			message: "#^Cannot call method getFlatDefaultConfig\\(\\) on mixed\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/ManageController.php
-
-		-
-			message: "#^Cannot call method resetConfigData\\(\\) on mixed\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/ManageController.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, PhpMyAdmin\\\\Message\\|string given\\.$#"
 			count: 1
@@ -3115,16 +3060,6 @@ parameters:
 			count: 1
 			path: src/Controllers/Preferences/ManageController.php
 
-		-
-			message: "#^Parameter \\#1 \\$cf of class PhpMyAdmin\\\\Config\\\\Forms\\\\User\\\\UserFormList constructor expects PhpMyAdmin\\\\Config\\\\ConfigFile, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/ManageController.php
-
-		-
-			message: "#^Parameter \\#1 \\$configArray of method PhpMyAdmin\\\\UserPreferences\\:\\:save\\(\\) expects array, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/ManageController.php
-
 		-
 			message: "#^Parameter \\#1 \\$fileName of method PhpMyAdmin\\\\UserPreferences\\:\\:redirect\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
@@ -3160,46 +3095,16 @@ parameters:
 			count: 1
 			path: src/Controllers/Preferences/ManageController.php
 
-		-
-			message: "#^Parameter \\#1 \\.\\.\\.\\$arrays of function array_merge expects array, mixed given\\.$#"
-			count: 2
-			path: src/Controllers/Preferences/ManageController.php
-
-		-
-			message: "#^Parameter \\#2 \\.\\.\\.\\$arrays of function array_merge expects array, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/ManageController.php
-
 		-
 			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, \\(int\\|string\\) given\\.$#"
 			count: 1
 			path: src/Controllers/Preferences/ManageController.php
 
-		-
-			message: "#^Cannot call method getConfigArray\\(\\) on mixed\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/NavigationController.php
-
-		-
-			message: "#^Parameter \\#1 \\$configArray of method PhpMyAdmin\\\\UserPreferences\\:\\:save\\(\\) expects array, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/NavigationController.php
-
 		-
 			message: "#^Parameter \\#1 \\$string of function ltrim expects string, mixed given\\.$#"
 			count: 1
 			path: src/Controllers/Preferences/NavigationController.php
 
-		-
-			message: "#^Cannot call method getConfigArray\\(\\) on mixed\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/SqlController.php
-
-		-
-			message: "#^Parameter \\#1 \\$configArray of method PhpMyAdmin\\\\UserPreferences\\:\\:save\\(\\) expects array, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Preferences/SqlController.php
-
 		-
 			message: "#^Parameter \\#1 \\$string of function ltrim expects string, mixed given\\.$#"
 			count: 1
@@ -3765,56 +3670,11 @@ parameters:
 			count: 1
 			path: src/Controllers/Setup/HomeController.php
 
-		-
-			message: "#^Parameter \\#1 \\$config of class PhpMyAdmin\\\\Controllers\\\\Setup\\\\ConfigController constructor expects PhpMyAdmin\\\\Config\\\\ConfigFile, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Setup/MainController.php
-
-		-
-			message: "#^Parameter \\#1 \\$config of class PhpMyAdmin\\\\Controllers\\\\Setup\\\\FormController constructor expects PhpMyAdmin\\\\Config\\\\ConfigFile, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Setup/MainController.php
-
-		-
-			message: "#^Parameter \\#1 \\$config of class PhpMyAdmin\\\\Controllers\\\\Setup\\\\HomeController constructor expects PhpMyAdmin\\\\Config\\\\ConfigFile, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Setup/MainController.php
-
-		-
-			message: "#^Parameter \\#1 \\$config of class PhpMyAdmin\\\\Controllers\\\\Setup\\\\ServerDestroyController constructor expects PhpMyAdmin\\\\Config\\\\ConfigFile, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Setup/MainController.php
-
-		-
-			message: "#^Parameter \\#1 \\$config of class PhpMyAdmin\\\\Controllers\\\\Setup\\\\ServersController constructor expects PhpMyAdmin\\\\Config\\\\ConfigFile, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Setup/MainController.php
-
 		-
 			message: "#^Parameter \\#1 \\$filename of function file_exists expects string, mixed given\\.$#"
 			count: 1
 			path: src/Controllers/Setup/MainController.php
 
-		-
-			message: "#^Cannot call method resetConfigData\\(\\) on mixed\\.$#"
-			count: 1
-			path: src/Controllers/Setup/ShowConfigController.php
-
-		-
-			message: "#^Parameter \\#1 \\$cf of class PhpMyAdmin\\\\Config\\\\Forms\\\\Setup\\\\ConfigForm constructor expects PhpMyAdmin\\\\Config\\\\ConfigFile, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Setup/ShowConfigController.php
-
-		-
-			message: "#^Parameter \\#1 \\$cf of static method PhpMyAdmin\\\\Setup\\\\ConfigGenerator\\:\\:getConfigFile\\(\\) expects PhpMyAdmin\\\\Config\\\\ConfigFile, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Setup/ShowConfigController.php
-
-		-
-			message: "#^Parameter \\#1 \\$cf of static method PhpMyAdmin\\\\Config\\\\Validator\\:\\:validate\\(\\) expects PhpMyAdmin\\\\Config\\\\ConfigFile, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Setup/ValidateController.php
-
 		-
 			message: "#^Cannot cast mixed to string\\.$#"
 			count: 2
@@ -15235,11 +15095,6 @@ parameters:
 			count: 2
 			path: tests/unit/Config/ServerConfigChecksTest.php
 
-		-
-			message: "#^Parameter \\#1 \\$cfg of class PhpMyAdmin\\\\Config\\\\ServerConfigChecks constructor expects PhpMyAdmin\\\\Config\\\\ConfigFile, mixed given\\.$#"
-			count: 3
-			path: tests/unit/Config/ServerConfigChecksTest.php
-
 		-
 			message: "#^Property PhpMyAdmin\\\\Tests\\\\Config\\\\ServerConfigChecksTest\\:\\:\\$sessionID \\(string\\) does not accept mixed\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 2888fb0074..c4054e6381 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -2306,7 +2306,6 @@
       <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
     <InvalidArrayOffset>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['hash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
     </InvalidArrayOffset>
@@ -2314,7 +2313,6 @@
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
     </MixedArgument>
     <MixedAssignment>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['hash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
@@ -2328,7 +2326,6 @@
       <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
     <InvalidArrayOffset>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['hash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
     </InvalidArrayOffset>
@@ -2336,7 +2333,6 @@
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
     </MixedArgument>
     <MixedAssignment>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['hash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
@@ -2350,7 +2346,6 @@
       <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
     <InvalidArrayOffset>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['hash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
     </InvalidArrayOffset>
@@ -2358,7 +2353,6 @@
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
     </MixedArgument>
     <MixedAssignment>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['hash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
@@ -2372,7 +2366,6 @@
       <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
     <InvalidArrayOffset>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['hash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
     </InvalidArrayOffset>
@@ -2380,7 +2373,6 @@
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
     </MixedArgument>
     <MixedAssignment>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['hash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
@@ -2394,7 +2386,6 @@
       <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
     <InvalidArrayOffset>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['query']]]></code>
     </InvalidArrayOffset>
     <MixedArgument>
@@ -2407,7 +2398,6 @@
       <code><![CDATA[$key]]></code>
     </MixedArgumentTypeCoercion>
     <MixedAssignment>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['query']]]></code>
       <code><![CDATA[$_POST[str_replace('/', '-', (string) $k)]]]></code>
       <code><![CDATA[$configuration]]></code>
@@ -2453,7 +2443,6 @@
       <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
     <InvalidArrayOffset>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['hash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
     </InvalidArrayOffset>
@@ -2461,7 +2450,6 @@
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
     </MixedArgument>
     <MixedAssignment>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['hash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
@@ -2475,7 +2463,6 @@
       <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
     <InvalidArrayOffset>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['hash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
     </InvalidArrayOffset>
@@ -2483,7 +2470,6 @@
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
     </MixedArgument>
     <MixedAssignment>
-      <code><![CDATA[$GLOBALS['cf']]]></code>
       <code><![CDATA[$GLOBALS['hash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
       <code><![CDATA[$GLOBALS['tabHash']]]></code>
diff --git a/psalm.xml b/psalm.xml
index a1b5ac3433..c3a7ff0cd8 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -49,7 +49,6 @@
             complete_query: string,
             compression: 'none'|'zip'|'gzip',
             conn_error: string,
-            ConfigFile: PhpMyAdmin\Config\ConfigFile,
             csv_columns: bool,
             csv_enclosed: string,
             csv_escaped: string,
diff --git a/src/Config/PageSettings.php b/src/Config/PageSettings.php
index c8e99d3602..540f1e6dc7 100644
--- a/src/Config/PageSettings.php
+++ b/src/Config/PageSettings.php
@@ -65,15 +65,15 @@ class PageSettings
 
         $this->groupName = $formGroupName;
 
-        $cf = new ConfigFile(Config::getInstance()->baseSettings);
-        $this->userPreferences->pageInit($cf);
+        $configFile = new ConfigFile(Config::getInstance()->baseSettings);
+        $this->userPreferences->pageInit($configFile);
 
-        $formDisplay = new $formClass($cf);
+        $formDisplay = new $formClass($configFile);
 
         // Process form
         $error = null;
         if (isset($_POST['submit_save']) && $_POST['submit_save'] == $formGroupName) {
-            $error = $this->processPageSettings($formDisplay, $cf);
+            $error = $this->processPageSettings($formDisplay, $configFile);
         }
 
         // Display forms
diff --git a/src/Controllers/Preferences/ExportController.php b/src/Controllers/Preferences/ExportController.php
index 8069ef17ab..3225c85022 100644
--- a/src/Controllers/Preferences/ExportController.php
+++ b/src/Controllers/Preferences/ExportController.php
@@ -35,15 +35,14 @@ final class ExportController implements InvocableController
 
     public function __invoke(ServerRequest $request): Response|null
     {
-        $GLOBALS['cf'] ??= null;
         $GLOBALS['error'] ??= null;
         $GLOBALS['tabHash'] ??= null;
         $GLOBALS['hash'] ??= null;
 
-        $GLOBALS['cf'] = new ConfigFile($this->config->baseSettings);
-        $this->userPreferences->pageInit($GLOBALS['cf']);
+        $configFile = new ConfigFile($this->config->baseSettings);
+        $this->userPreferences->pageInit($configFile);
 
-        $formDisplay = new ExportForm($GLOBALS['cf'], 1);
+        $formDisplay = new ExportForm($configFile, 1);
 
         if ($request->hasBodyParam('revert')) {
             // revert erroneous fields to their default values
@@ -58,7 +57,7 @@ final class ExportController implements InvocableController
             // Load 2FA settings
             $twoFactor = new TwoFactor(Config::getInstance()->selectedServer['user']);
             // save settings
-            $result = $this->userPreferences->save($GLOBALS['cf']->getConfigArray());
+            $result = $this->userPreferences->save($configFile->getConfigArray());
             // save back the 2FA setting only
             $twoFactor->save();
             if ($result === true) {
diff --git a/src/Controllers/Preferences/FeaturesController.php b/src/Controllers/Preferences/FeaturesController.php
index f7b7f6b39d..354224386b 100644
--- a/src/Controllers/Preferences/FeaturesController.php
+++ b/src/Controllers/Preferences/FeaturesController.php
@@ -35,15 +35,14 @@ final class FeaturesController implements InvocableController
 
     public function __invoke(ServerRequest $request): Response|null
     {
-        $GLOBALS['cf'] ??= null;
         $GLOBALS['error'] ??= null;
         $GLOBALS['tabHash'] ??= null;
         $GLOBALS['hash'] ??= null;
 
-        $GLOBALS['cf'] = new ConfigFile($this->config->baseSettings);
-        $this->userPreferences->pageInit($GLOBALS['cf']);
+        $configFile = new ConfigFile($this->config->baseSettings);
+        $this->userPreferences->pageInit($configFile);
 
-        $formDisplay = new FeaturesForm($GLOBALS['cf'], 1);
+        $formDisplay = new FeaturesForm($configFile, 1);
 
         if ($request->hasBodyParam('revert')) {
             // revert erroneous fields to their default values
@@ -58,7 +57,7 @@ final class FeaturesController implements InvocableController
             // Load 2FA settings
             $twoFactor = new TwoFactor(Config::getInstance()->selectedServer['user']);
             // save settings
-            $result = $this->userPreferences->save($GLOBALS['cf']->getConfigArray());
+            $result = $this->userPreferences->save($configFile->getConfigArray());
             // save back the 2FA setting only
             $twoFactor->save();
             if ($result === true) {
diff --git a/src/Controllers/Preferences/ImportController.php b/src/Controllers/Preferences/ImportController.php
index 08d9ca992c..3da6a9ac11 100644
--- a/src/Controllers/Preferences/ImportController.php
+++ b/src/Controllers/Preferences/ImportController.php
@@ -35,15 +35,14 @@ final class ImportController implements InvocableController
 
     public function __invoke(ServerRequest $request): Response|null
     {
-        $GLOBALS['cf'] ??= null;
         $GLOBALS['error'] ??= null;
         $GLOBALS['tabHash'] ??= null;
         $GLOBALS['hash'] ??= null;
 
-        $GLOBALS['cf'] = new ConfigFile($this->config->baseSettings);
-        $this->userPreferences->pageInit($GLOBALS['cf']);
+        $configFile = new ConfigFile($this->config->baseSettings);
+        $this->userPreferences->pageInit($configFile);
 
-        $formDisplay = new ImportForm($GLOBALS['cf'], 1);
+        $formDisplay = new ImportForm($configFile, 1);
 
         if ($request->hasBodyParam('revert')) {
             // revert erroneous fields to their default values
@@ -58,7 +57,7 @@ final class ImportController implements InvocableController
             // Load 2FA settings
             $twoFactor = new TwoFactor(Config::getInstance()->selectedServer['user']);
             // save settings
-            $result = $this->userPreferences->save($GLOBALS['cf']->getConfigArray());
+            $result = $this->userPreferences->save($configFile->getConfigArray());
             // save back the 2FA setting only
             $twoFactor->save();
             if ($result === true) {
diff --git a/src/Controllers/Preferences/MainPanelController.php b/src/Controllers/Preferences/MainPanelController.php
index fdc96b7002..6c0ef35ec9 100644
--- a/src/Controllers/Preferences/MainPanelController.php
+++ b/src/Controllers/Preferences/MainPanelController.php
@@ -35,15 +35,14 @@ final class MainPanelController implements InvocableController
 
     public function __invoke(ServerRequest $request): Response|null
     {
-        $GLOBALS['cf'] ??= null;
         $GLOBALS['error'] ??= null;
         $GLOBALS['tabHash'] ??= null;
         $GLOBALS['hash'] ??= null;
 
-        $GLOBALS['cf'] = new ConfigFile($this->config->baseSettings);
-        $this->userPreferences->pageInit($GLOBALS['cf']);
+        $configFile = new ConfigFile($this->config->baseSettings);
+        $this->userPreferences->pageInit($configFile);
 
-        $formDisplay = new MainForm($GLOBALS['cf'], 1);
+        $formDisplay = new MainForm($configFile, 1);
 
         if ($request->hasBodyParam('revert')) {
             // revert erroneous fields to their default values
@@ -58,7 +57,7 @@ final class MainPanelController implements InvocableController
             // Load 2FA settings
             $twoFactor = new TwoFactor(Config::getInstance()->selectedServer['user']);
             // save settings
-            $result = $this->userPreferences->save($GLOBALS['cf']->getConfigArray());
+            $result = $this->userPreferences->save($configFile->getConfigArray());
             // save back the 2FA setting only
             $twoFactor->save();
             if ($result === true) {
diff --git a/src/Controllers/Preferences/ManageController.php b/src/Controllers/Preferences/ManageController.php
index fb7878d681..692fff87dc 100644
--- a/src/Controllers/Preferences/ManageController.php
+++ b/src/Controllers/Preferences/ManageController.php
@@ -58,15 +58,14 @@ final class ManageController implements InvocableController
 
     public function __invoke(ServerRequest $request): Response|null
     {
-        $GLOBALS['cf'] ??= null;
         $GLOBALS['error'] ??= null;
         $GLOBALS['lang'] ??= null;
         $GLOBALS['query'] ??= null;
 
         $route = $request->getRoute();
 
-        $GLOBALS['cf'] = new ConfigFile($this->config->baseSettings);
-        $this->userPreferences->pageInit($GLOBALS['cf']);
+        $configFile = new ConfigFile($this->config->baseSettings);
+        $this->userPreferences->pageInit($configFile);
 
         $GLOBALS['error'] = '';
         if ($request->hasBodyParam('submit_export') && $request->getParsedBodyParam('export_type') === 'text_file') {
@@ -142,10 +141,10 @@ final class ManageController implements InvocableController
             } else {
                 // sanitize input values: treat them as though
                 // they came from HTTP POST request
-                $formDisplay = new UserFormList($GLOBALS['cf']);
-                $newConfig = $GLOBALS['cf']->getFlatDefaultConfig();
+                $formDisplay = new UserFormList($configFile);
+                $newConfig = $configFile->getFlatDefaultConfig();
                 if ($request->hasBodyParam('import_merge')) {
-                    $newConfig = array_merge($newConfig, $GLOBALS['cf']->getConfigArray());
+                    $newConfig = array_merge($newConfig, $configFile->getConfigArray());
                 }
 
                 $newConfig = array_merge($newConfig, $configuration);
@@ -154,7 +153,7 @@ final class ManageController implements InvocableController
                     $_POST[str_replace('/', '-', (string) $k)] = $v;
                 }
 
-                $GLOBALS['cf']->resetConfigData();
+                $configFile->resetConfigData();
                 $allOk = $formDisplay->process(true, false);
                 $allOk = $allOk && ! $formDisplay->hasErrors();
                 $_POST = $postParamBackup;
@@ -200,7 +199,7 @@ final class ManageController implements InvocableController
                 }
 
                 // save settings
-                $result = $this->userPreferences->save($GLOBALS['cf']->getConfigArray());
+                $result = $this->userPreferences->save($configFile->getConfigArray());
                 if ($result === true) {
                     if ($returnUrl) {
                         $GLOBALS['query'] = Util::splitURLQuery($returnUrl);
diff --git a/src/Controllers/Preferences/NavigationController.php b/src/Controllers/Preferences/NavigationController.php
index e11b055278..38796c923f 100644
--- a/src/Controllers/Preferences/NavigationController.php
+++ b/src/Controllers/Preferences/NavigationController.php
@@ -35,15 +35,14 @@ final class NavigationController implements InvocableController
 
     public function __invoke(ServerRequest $request): Response|null
     {
-        $GLOBALS['cf'] ??= null;
         $GLOBALS['error'] ??= null;
         $GLOBALS['tabHash'] ??= null;
         $GLOBALS['hash'] ??= null;
 
-        $GLOBALS['cf'] = new ConfigFile($this->config->baseSettings);
-        $this->userPreferences->pageInit($GLOBALS['cf']);
+        $configFile = new ConfigFile($this->config->baseSettings);
+        $this->userPreferences->pageInit($configFile);
 
-        $formDisplay = new NaviForm($GLOBALS['cf'], 1);
+        $formDisplay = new NaviForm($configFile, 1);
 
         if ($request->hasBodyParam('revert')) {
             // revert erroneous fields to their default values
@@ -58,7 +57,7 @@ final class NavigationController implements InvocableController
             // Load 2FA settings
             $twoFactor = new TwoFactor(Config::getInstance()->selectedServer['user']);
             // save settings
-            $result = $this->userPreferences->save($GLOBALS['cf']->getConfigArray());
+            $result = $this->userPreferences->save($configFile->getConfigArray());
             // save back the 2FA setting only
             $twoFactor->save();
             if ($result === true) {
diff --git a/src/Controllers/Preferences/SqlController.php b/src/Controllers/Preferences/SqlController.php
index f443b730e7..853c0081ed 100644
--- a/src/Controllers/Preferences/SqlController.php
+++ b/src/Controllers/Preferences/SqlController.php
@@ -35,15 +35,14 @@ final class SqlController implements InvocableController
 
     public function __invoke(ServerRequest $request): Response|null
     {
-        $GLOBALS['cf'] ??= null;
         $GLOBALS['error'] ??= null;
         $GLOBALS['tabHash'] ??= null;
         $GLOBALS['hash'] ??= null;
 
-        $GLOBALS['cf'] = new ConfigFile($this->config->baseSettings);
-        $this->userPreferences->pageInit($GLOBALS['cf']);
+        $configFile = new ConfigFile($this->config->baseSettings);
+        $this->userPreferences->pageInit($configFile);
 
-        $formDisplay = new SqlForm($GLOBALS['cf'], 1);
+        $formDisplay = new SqlForm($configFile, 1);
 
         if ($request->hasBodyParam('revert')) {
             // revert erroneous fields to their default values
@@ -58,7 +57,7 @@ final class SqlController implements InvocableController
             // Load 2FA settings
             $twoFactor = new TwoFactor(Config::getInstance()->selectedServer['user']);
             // save settings
-            $result = $this->userPreferences->save($GLOBALS['cf']->getConfigArray());
+            $result = $this->userPreferences->save($configFile->getConfigArray());
             // save back the 2FA setting only
             $twoFactor->save();
             if ($result === true) {
diff --git a/src/Controllers/Setup/AbstractController.php b/src/Controllers/Setup/AbstractController.php
index e83bc066a6..957f9f520c 100644
--- a/src/Controllers/Setup/AbstractController.php
+++ b/src/Controllers/Setup/AbstractController.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Setup;
 
-use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Config\Forms\BaseForm;
 use PhpMyAdmin\Config\Forms\Setup\SetupFormList;
 use PhpMyAdmin\Template;
@@ -13,7 +12,7 @@ use function in_array;
 
 abstract class AbstractController
 {
-    public function __construct(protected ConfigFile $config, protected Template $template)
+    public function __construct(protected Template $template)
     {
     }
 
diff --git a/src/Controllers/Setup/ConfigController.php b/src/Controllers/Setup/ConfigController.php
index 2a7078d973..55a372a67a 100644
--- a/src/Controllers/Setup/ConfigController.php
+++ b/src/Controllers/Setup/ConfigController.php
@@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Setup;
 
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\Setup\ConfigGenerator;
+use PhpMyAdmin\Setup\SetupHelper;
 
 use function is_string;
 
@@ -20,7 +21,9 @@ class ConfigController extends AbstractController
             $hasCheckPageRefresh = true;
         }
 
-        $config = ConfigGenerator::getConfigFile($this->config);
+        $configFile = SetupHelper::createConfigFile();
+
+        $config = ConfigGenerator::getConfigFile($configFile);
 
         return $this->template->render('setup/config/index', [
             'formset' => $this->getFormSetParam($request->getQueryParam('formset')),
diff --git a/src/Controllers/Setup/FormController.php b/src/Controllers/Setup/FormController.php
index 3cbedd762f..db65c3bd47 100644
--- a/src/Controllers/Setup/FormController.php
+++ b/src/Controllers/Setup/FormController.php
@@ -8,6 +8,7 @@ use PhpMyAdmin\Config\Forms\Setup\SetupFormList;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Setup\FormProcessing;
+use PhpMyAdmin\Setup\SetupHelper;
 
 use function __;
 use function is_string;
@@ -31,8 +32,10 @@ class FormController extends AbstractController
             ]);
         }
 
+        $configFile = SetupHelper::createConfigFile();
+
         ob_start();
-        $form = new $formClass($this->config);
+        $form = new $formClass($configFile);
         FormProcessing::process($form);
         $page = ob_get_clean();
 
diff --git a/src/Controllers/Setup/HomeController.php b/src/Controllers/Setup/HomeController.php
index be6d07ac5c..3a0c59666f 100644
--- a/src/Controllers/Setup/HomeController.php
+++ b/src/Controllers/Setup/HomeController.php
@@ -9,6 +9,7 @@ use PhpMyAdmin\Config\ServerConfigChecks;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Setup\Index;
+use PhpMyAdmin\Setup\SetupHelper;
 
 use function __;
 use function array_keys;
@@ -29,8 +30,10 @@ class HomeController extends AbstractController
             Index::versionCheck();
         }
 
+        $configFile = SetupHelper::createConfigFile();
+
         // Perform various security, compatibility and consistency checks
-        $configChecker = new ServerConfigChecks($this->config);
+        $configChecker = new ServerConfigChecks($configFile);
         $configChecker->performConfigChecks();
 
         $text = __(
@@ -60,12 +63,12 @@ class HomeController extends AbstractController
         }
 
         $servers = [];
-        foreach (array_keys($this->config->getServers()) as $id) {
+        foreach (array_keys($configFile->getServers()) as $id) {
             $servers[$id] = [
                 'id' => $id,
-                'name' => $this->config->getServerName($id),
-                'auth_type' => $this->config->getValue('Servers/' . $id . '/auth_type'),
-                'dsn' => $this->config->getServerDSN($id),
+                'name' => $configFile->getServerName($id),
+                'auth_type' => $configFile->getValue('Servers/' . $id . '/auth_type'),
+                'dsn' => $configFile->getServerDSN($id),
                 'params' => [
                     'token' => $_SESSION[' PMA_token '],
                     'edit' => ['page' => 'servers', 'mode' => 'edit', 'id' => $id],
@@ -83,7 +86,7 @@ class HomeController extends AbstractController
             'formset' => $this->getFormSetParam($request->getQueryParam('formset')),
             'languages' => $languages,
             'messages' => $messages,
-            'server_count' => $this->config->getServerCount(),
+            'server_count' => $configFile->getServerCount(),
             'servers' => $servers,
             'pages' => $pages,
             'has_check_page_refresh' => $hasCheckPageRefresh,
diff --git a/src/Controllers/Setup/MainController.php b/src/Controllers/Setup/MainController.php
index 3454835106..98c001af01 100644
--- a/src/Controllers/Setup/MainController.php
+++ b/src/Controllers/Setup/MainController.php
@@ -56,16 +56,16 @@ final class MainController implements InvocableController
         }
 
         if ($page === 'form') {
-            return $response->write((new FormController($GLOBALS['ConfigFile'], $this->template))($request));
+            return $response->write((new FormController($this->template))($request));
         }
 
         if ($page === 'config') {
-            return $response->write((new ConfigController($GLOBALS['ConfigFile'], $this->template))($request));
+            return $response->write((new ConfigController($this->template))($request));
         }
 
         if ($page === 'servers') {
             if ($request->getQueryParam('mode') === 'remove' && $request->isPost()) {
-                (new ServerDestroyController($GLOBALS['ConfigFile'], $this->template))($request);
+                (new ServerDestroyController($this->template))($request);
                 $response = $response->withStatus(StatusCodeInterface::STATUS_FOUND);
 
                 return $response->withHeader(
@@ -74,9 +74,9 @@ final class MainController implements InvocableController
                 );
             }
 
-            return $response->write((new ServersController($GLOBALS['ConfigFile'], $this->template))($request));
+            return $response->write((new ServersController($this->template))($request));
         }
 
-        return $response->write((new HomeController($GLOBALS['ConfigFile'], $this->template))($request));
+        return $response->write((new HomeController($this->template))($request));
     }
 }
diff --git a/src/Controllers/Setup/ServerDestroyController.php b/src/Controllers/Setup/ServerDestroyController.php
index 8b29faf388..2eca3b889b 100644
--- a/src/Controllers/Setup/ServerDestroyController.php
+++ b/src/Controllers/Setup/ServerDestroyController.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace PhpMyAdmin\Controllers\Setup;
 
 use PhpMyAdmin\Http\ServerRequest;
+use PhpMyAdmin\Setup\SetupHelper;
 
 use function is_numeric;
 
@@ -12,13 +13,15 @@ class ServerDestroyController extends AbstractController
 {
     public function __invoke(ServerRequest $request): void
     {
+        $configFile = SetupHelper::createConfigFile();
+
         $id = $this->getIdParam($request->getQueryParam('id'));
-        $hasServer = $id >= 1 && $this->config->get('Servers/' . $id) !== null;
+        $hasServer = $id >= 1 && $configFile->get('Servers/' . $id) !== null;
         if (! $hasServer) {
             return;
         }
 
-        $this->config->removeServer($id);
+        $configFile->removeServer($id);
     }
 
     /** @psalm-return int<0, max> */
diff --git a/src/Controllers/Setup/ServersController.php b/src/Controllers/Setup/ServersController.php
index e144c61983..110b2128ef 100644
--- a/src/Controllers/Setup/ServersController.php
+++ b/src/Controllers/Setup/ServersController.php
@@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Setup;
 use PhpMyAdmin\Config\Forms\Setup\ServersForm;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\Setup\FormProcessing;
+use PhpMyAdmin\Setup\SetupHelper;
 
 use function in_array;
 use function is_numeric;
@@ -18,19 +19,21 @@ class ServersController extends AbstractController
 {
     public function __invoke(ServerRequest $request): string
     {
+        $configFile = SetupHelper::createConfigFile();
+
         $id = $this->getIdParam($request->getQueryParam('id'));
         $mode = $this->getModeParam($request->getQueryParam('mode'));
 
         $pages = $this->getPages();
 
-        $hasServer = $id >= 1 && $this->config->get('Servers/' . $id) !== null;
+        $hasServer = $id >= 1 && $configFile->get('Servers/' . $id) !== null;
 
         if (! $hasServer && $mode !== 'revert' && $mode !== 'edit') {
             $id = 0;
         }
 
         ob_start();
-        FormProcessing::process(new ServersForm($this->config, $id));
+        FormProcessing::process(new ServersForm($configFile, $id));
         $page = ob_get_clean();
 
         return $this->template->render('setup/servers/index', [
@@ -39,7 +42,7 @@ class ServersController extends AbstractController
             'has_server' => $hasServer,
             'mode' => $mode,
             'server_id' => $id,
-            'server_dsn' => $this->config->getServerDSN($id),
+            'server_dsn' => $configFile->getServerDSN($id),
             'page' => $page,
         ]);
     }
diff --git a/src/Controllers/Setup/ShowConfigController.php b/src/Controllers/Setup/ShowConfigController.php
index 0d652bb1ef..4373e3b66d 100644
--- a/src/Controllers/Setup/ShowConfigController.php
+++ b/src/Controllers/Setup/ShowConfigController.php
@@ -12,6 +12,7 @@ use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Setup\ConfigGenerator;
+use PhpMyAdmin\Setup\SetupHelper;
 use PhpMyAdmin\Url;
 
 use function is_string;
@@ -24,7 +25,9 @@ final class ShowConfigController implements InvocableController
 
     public function __invoke(ServerRequest $request): Response
     {
-        $formDisplay = new ConfigForm($GLOBALS['ConfigFile']);
+        $configFile = SetupHelper::createConfigFile();
+
+        $formDisplay = new ConfigForm($configFile);
         $formDisplay->save(['Config']);
 
         $this->responseRenderer->disable();
@@ -39,7 +42,7 @@ final class ShowConfigController implements InvocableController
         $submitClear = $request->getParsedBodyParam('submit_clear');
         if (is_string($submitClear) && $submitClear !== '') {
             // Clear current config and return to main page
-            $GLOBALS['ConfigFile']->resetConfigData();
+            $configFile->resetConfigData();
             // drop post data
             $this->responseRenderer->addHeader(
                 'Location',
@@ -56,7 +59,7 @@ final class ShowConfigController implements InvocableController
             // Output generated config file
             Core::downloadHeader('config.inc.php', 'text/plain');
             $this->responseRenderer->disable();
-            echo ConfigGenerator::getConfigFile($GLOBALS['ConfigFile']);
+            echo ConfigGenerator::getConfigFile($configFile);
 
             return $this->responseRenderer->response();
         }
diff --git a/src/Controllers/Setup/ValidateController.php b/src/Controllers/Setup/ValidateController.php
index 0e0d900356..e7247be248 100644
--- a/src/Controllers/Setup/ValidateController.php
+++ b/src/Controllers/Setup/ValidateController.php
@@ -10,6 +10,7 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\Http\Factory\ResponseFactory;
 use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
+use PhpMyAdmin\Setup\SetupHelper;
 use stdClass;
 
 use function __;
@@ -44,8 +45,10 @@ final class ValidateController implements InvocableController
             return $response->write((string) json_encode(['success' => false, 'message' => __('Wrong data')]));
         }
 
+        $configFile = SetupHelper::createConfigFile();
+
         $values = (array) $values;
-        $result = Validator::validate($GLOBALS['ConfigFile'], $vids, $values, true);
+        $result = Validator::validate($configFile, $vids, $values, true);
         if ($result === false) {
             $result = sprintf(
                 __('Wrong data or no validation for %s'),
diff --git a/src/Http/Middleware/SetupPageRedirection.php b/src/Http/Middleware/SetupPageRedirection.php
index b40fd336db..6981c25b0d 100644
--- a/src/Http/Middleware/SetupPageRedirection.php
+++ b/src/Http/Middleware/SetupPageRedirection.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace PhpMyAdmin\Http\Middleware;
 
 use PhpMyAdmin\Config;
-use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Container\ContainerBuilder;
 use PhpMyAdmin\Exceptions\ExitException;
 use PhpMyAdmin\Http\Factory\ResponseFactory;
@@ -57,21 +56,6 @@ final class SetupPageRedirection implements MiddlewareInterface
         $this->config->setCookie('pma_lang', $GLOBALS['lang']);
         $this->config->set('is_setup', true);
 
-        $GLOBALS['ConfigFile'] = new ConfigFile();
-        $GLOBALS['ConfigFile']->setPersistKeys([
-            'DefaultLang',
-            'ServerDefault',
-            'UploadDir',
-            'SaveDir',
-            'Servers/1/verbose',
-            'Servers/1/host',
-            'Servers/1/port',
-            'Servers/1/socket',
-            'Servers/1/auth_type',
-            'Servers/1/user',
-            'Servers/1/password',
-        ]);
-
         // allows for redirection even after sending some data
         ob_start();
     }
diff --git a/src/Setup/SetupHelper.php b/src/Setup/SetupHelper.php
new file mode 100644
index 0000000000..2d42566ab3
--- /dev/null
+++ b/src/Setup/SetupHelper.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Setup;
+
+use PhpMyAdmin\Config\ConfigFile;
+
+final class SetupHelper
+{
+    public static function createConfigFile(): ConfigFile
+    {
+        $configFile = new ConfigFile();
+        $configFile->setPersistKeys([
+            'DefaultLang',
+            'ServerDefault',
+            'UploadDir',
+            'SaveDir',
+            'Servers/1/verbose',
+            'Servers/1/host',
+            'Servers/1/port',
+            'Servers/1/socket',
+            'Servers/1/auth_type',
+            'Servers/1/user',
+            'Servers/1/password',
+        ]);
+
+        return $configFile;
+    }
+}
diff --git a/tests/unit/Config/ServerConfigChecksTest.php b/tests/unit/Config/ServerConfigChecksTest.php
index fae1438fd5..db21413bcc 100644
--- a/tests/unit/Config/ServerConfigChecksTest.php
+++ b/tests/unit/Config/ServerConfigChecksTest.php
@@ -24,6 +24,8 @@ class ServerConfigChecksTest extends AbstractTestCase
 {
     private string $sessionID;
 
+    private ConfigFile $configFile;
+
     /** @throws ReflectionException */
     protected function setUp(): void
     {
@@ -35,11 +37,10 @@ class ServerConfigChecksTest extends AbstractTestCase
         $config->settings['AvailableCharsets'] = [];
         $config->settings['ServerDefault'] = 0;
 
-        $cf = new ConfigFile();
-        $GLOBALS['ConfigFile'] = $cf;
+        $this->configFile = new ConfigFile();
 
         $reflection = new ReflectionProperty(ConfigFile::class, 'id');
-        $this->sessionID = $reflection->getValue($cf);
+        $this->sessionID = $reflection->getValue($this->configFile);
 
         unset($_SESSION['messages']);
         unset($_SESSION[$this->sessionID]);
@@ -70,7 +71,7 @@ class ServerConfigChecksTest extends AbstractTestCase
 
         $configChecker = $this->getMockBuilder(ServerConfigChecks::class)
             ->onlyMethods(['functionExists'])
-            ->setConstructorArgs([$GLOBALS['ConfigFile']])
+            ->setConstructorArgs([$this->configFile])
             ->getMock();
 
         // Configure the stub.
@@ -113,7 +114,7 @@ class ServerConfigChecksTest extends AbstractTestCase
         $_SESSION[$this->sessionID]['BZipDump'] = false;
         $_SESSION[$this->sessionID]['ZipDump'] = false;
 
-        $configChecker = new ServerConfigChecks($GLOBALS['ConfigFile']);
+        $configChecker = new ServerConfigChecks($this->configFile);
         $configChecker->performConfigChecks();
 
         /**
@@ -141,7 +142,7 @@ class ServerConfigChecksTest extends AbstractTestCase
             '1' => ['host' => 'localhost', 'ssl' => true, 'auth_type' => 'cookie', 'AllowRoot' => false],
         ];
 
-        $configChecker = new ServerConfigChecks($GLOBALS['ConfigFile']);
+        $configChecker = new ServerConfigChecks($this->configFile);
         $configChecker->performConfigChecks();
 
         /**
@@ -167,7 +168,7 @@ class ServerConfigChecksTest extends AbstractTestCase
         $_SESSION[$this->sessionID]['blowfish_secret'] = str_repeat('a', SODIUM_CRYPTO_SECRETBOX_KEYBYTES);
         $_SESSION[$this->sessionID]['Servers'] = ['1' => ['host' => 'localhost', 'auth_type' => 'cookie']];
 
-        $configChecker = new ServerConfigChecks($GLOBALS['ConfigFile']);
+        $configChecker = new ServerConfigChecks($this->configFile);
         $configChecker->performConfigChecks();
 
         /**
diff --git a/tests/unit/Setup/SetupHelperTest.php b/tests/unit/Setup/SetupHelperTest.php
new file mode 100644
index 0000000000..32955ca7e4
--- /dev/null
+++ b/tests/unit/Setup/SetupHelperTest.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Tests\Setup;
+
+use PhpMyAdmin\Setup\SetupHelper;
+use PhpMyAdmin\Tests\AbstractTestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
+
+#[CoversClass(SetupHelper::class)]
+final class SetupHelperTest extends AbstractTestCase
+{
+    public function testCreateConfigFile(): void
+    {
+        $expected = [
+            'DefaultLang' => 0,
+            'ServerDefault' => 1,
+            'UploadDir' => 2,
+            'SaveDir' => 3,
+            'Servers/1/verbose' => 4,
+            'Servers/1/host' => 5,
+            'Servers/1/port' => 6,
+            'Servers/1/socket' => 7,
+            'Servers/1/auth_type' => 8,
+            'Servers/1/user' => 9,
+            'Servers/1/password' => 10,
+        ];
+
+        $configFile = SetupHelper::createConfigFile();
+        self::assertSame($expected, $configFile->getPersistKeysMap());
+        self::assertNotSame($configFile, SetupHelper::createConfigFile());
+    }
+}

From 32447c6f72080d030d001f9a288467f90be75a44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Fri, 10 May 2024 21:45:32 -0300
Subject: [PATCH 5/9] Remove Controllers\Setup\AbstractController class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extracts AbstractController::getPages into SetupHelper class.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 src/Controllers/Setup/AbstractController.php  | 37 -------------------
 src/Controllers/Setup/ConfigController.php    |  9 ++++-
 src/Controllers/Setup/FormController.php      |  9 ++++-
 src/Controllers/Setup/HomeController.php      |  9 ++++-
 src/Controllers/Setup/MainController.php      |  2 +-
 .../Setup/ServerDestroyController.php         |  2 +-
 src/Controllers/Setup/ServersController.php   |  9 ++++-
 src/Setup/SetupHelper.php                     | 23 ++++++++++++
 tests/unit/Setup/SetupHelperTest.php          | 13 +++++++
 9 files changed, 66 insertions(+), 47 deletions(-)
 delete mode 100644 src/Controllers/Setup/AbstractController.php

diff --git a/src/Controllers/Setup/AbstractController.php b/src/Controllers/Setup/AbstractController.php
deleted file mode 100644
index 957f9f520c..0000000000
--- a/src/Controllers/Setup/AbstractController.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace PhpMyAdmin\Controllers\Setup;
-
-use PhpMyAdmin\Config\Forms\BaseForm;
-use PhpMyAdmin\Config\Forms\Setup\SetupFormList;
-use PhpMyAdmin\Template;
-
-use function in_array;
-
-abstract class AbstractController
-{
-    public function __construct(protected Template $template)
-    {
-    }
-
-    /** @return string[][] */
-    protected function getPages(): array
-    {
-        $ignored = ['Config', 'Servers'];
-        $pages = [];
-        foreach (SetupFormList::getAllFormNames() as $formset) {
-            if (in_array($formset, $ignored, true)) {
-                continue;
-            }
-
-            /** @var BaseForm $formClass */
-            $formClass = SetupFormList::get($formset);
-
-            $pages[$formset] = ['name' => $formClass::getName(), 'formset' => $formset];
-        }
-
-        return $pages;
-    }
-}
diff --git a/src/Controllers/Setup/ConfigController.php b/src/Controllers/Setup/ConfigController.php
index 55a372a67a..a136e88089 100644
--- a/src/Controllers/Setup/ConfigController.php
+++ b/src/Controllers/Setup/ConfigController.php
@@ -7,14 +7,19 @@ namespace PhpMyAdmin\Controllers\Setup;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\Setup\ConfigGenerator;
 use PhpMyAdmin\Setup\SetupHelper;
+use PhpMyAdmin\Template;
 
 use function is_string;
 
-class ConfigController extends AbstractController
+final class ConfigController
 {
+    public function __construct(private readonly Template $template)
+    {
+    }
+
     public function __invoke(ServerRequest $request): string
     {
-        $pages = $this->getPages();
+        $pages = SetupHelper::getPages();
 
         static $hasCheckPageRefresh = false;
         if (! $hasCheckPageRefresh) {
diff --git a/src/Controllers/Setup/FormController.php b/src/Controllers/Setup/FormController.php
index db65c3bd47..874fb07569 100644
--- a/src/Controllers/Setup/FormController.php
+++ b/src/Controllers/Setup/FormController.php
@@ -9,17 +9,22 @@ use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Setup\FormProcessing;
 use PhpMyAdmin\Setup\SetupHelper;
+use PhpMyAdmin\Template;
 
 use function __;
 use function is_string;
 use function ob_get_clean;
 use function ob_start;
 
-class FormController extends AbstractController
+final class FormController
 {
+    public function __construct(private readonly Template $template)
+    {
+    }
+
     public function __invoke(ServerRequest $request): string
     {
-        $pages = $this->getPages();
+        $pages = SetupHelper::getPages();
 
         $formSet = $this->getFormSetParam($request->getQueryParam('formset'));
 
diff --git a/src/Controllers/Setup/HomeController.php b/src/Controllers/Setup/HomeController.php
index 3a0c59666f..0f44fc140e 100644
--- a/src/Controllers/Setup/HomeController.php
+++ b/src/Controllers/Setup/HomeController.php
@@ -10,17 +10,22 @@ use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Setup\Index;
 use PhpMyAdmin\Setup\SetupHelper;
+use PhpMyAdmin\Template;
 
 use function __;
 use function array_keys;
 use function is_scalar;
 use function is_string;
 
-class HomeController extends AbstractController
+final class HomeController
 {
+    public function __construct(private readonly Template $template)
+    {
+    }
+
     public function __invoke(ServerRequest $request): string
     {
-        $pages = $this->getPages();
+        $pages = SetupHelper::getPages();
 
         // message handling
         Index::messagesBegin();
diff --git a/src/Controllers/Setup/MainController.php b/src/Controllers/Setup/MainController.php
index 98c001af01..64a90d9610 100644
--- a/src/Controllers/Setup/MainController.php
+++ b/src/Controllers/Setup/MainController.php
@@ -65,7 +65,7 @@ final class MainController implements InvocableController
 
         if ($page === 'servers') {
             if ($request->getQueryParam('mode') === 'remove' && $request->isPost()) {
-                (new ServerDestroyController($this->template))($request);
+                (new ServerDestroyController())($request);
                 $response = $response->withStatus(StatusCodeInterface::STATUS_FOUND);
 
                 return $response->withHeader(
diff --git a/src/Controllers/Setup/ServerDestroyController.php b/src/Controllers/Setup/ServerDestroyController.php
index 2eca3b889b..5a0607c086 100644
--- a/src/Controllers/Setup/ServerDestroyController.php
+++ b/src/Controllers/Setup/ServerDestroyController.php
@@ -9,7 +9,7 @@ use PhpMyAdmin\Setup\SetupHelper;
 
 use function is_numeric;
 
-class ServerDestroyController extends AbstractController
+final class ServerDestroyController
 {
     public function __invoke(ServerRequest $request): void
     {
diff --git a/src/Controllers/Setup/ServersController.php b/src/Controllers/Setup/ServersController.php
index 110b2128ef..00fee14e98 100644
--- a/src/Controllers/Setup/ServersController.php
+++ b/src/Controllers/Setup/ServersController.php
@@ -8,6 +8,7 @@ use PhpMyAdmin\Config\Forms\Setup\ServersForm;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\Setup\FormProcessing;
 use PhpMyAdmin\Setup\SetupHelper;
+use PhpMyAdmin\Template;
 
 use function in_array;
 use function is_numeric;
@@ -15,8 +16,12 @@ use function is_string;
 use function ob_get_clean;
 use function ob_start;
 
-class ServersController extends AbstractController
+final class ServersController
 {
+    public function __construct(private readonly Template $template)
+    {
+    }
+
     public function __invoke(ServerRequest $request): string
     {
         $configFile = SetupHelper::createConfigFile();
@@ -24,7 +29,7 @@ class ServersController extends AbstractController
         $id = $this->getIdParam($request->getQueryParam('id'));
         $mode = $this->getModeParam($request->getQueryParam('mode'));
 
-        $pages = $this->getPages();
+        $pages = SetupHelper::getPages();
 
         $hasServer = $id >= 1 && $configFile->get('Servers/' . $id) !== null;
 
diff --git a/src/Setup/SetupHelper.php b/src/Setup/SetupHelper.php
index 2d42566ab3..1bb6c5158e 100644
--- a/src/Setup/SetupHelper.php
+++ b/src/Setup/SetupHelper.php
@@ -5,6 +5,10 @@ declare(strict_types=1);
 namespace PhpMyAdmin\Setup;
 
 use PhpMyAdmin\Config\ConfigFile;
+use PhpMyAdmin\Config\Forms\BaseForm;
+use PhpMyAdmin\Config\Forms\Setup\SetupFormList;
+
+use function in_array;
 
 final class SetupHelper
 {
@@ -27,4 +31,23 @@ final class SetupHelper
 
         return $configFile;
     }
+
+    /** @return string[][] */
+    public static function getPages(): array
+    {
+        $ignored = ['Config', 'Servers'];
+        $pages = [];
+        foreach (SetupFormList::getAllFormNames() as $formset) {
+            if (in_array($formset, $ignored, true)) {
+                continue;
+            }
+
+            /** @var BaseForm $formClass */
+            $formClass = SetupFormList::get($formset);
+
+            $pages[$formset] = ['name' => $formClass::getName(), 'formset' => $formset];
+        }
+
+        return $pages;
+    }
 }
diff --git a/tests/unit/Setup/SetupHelperTest.php b/tests/unit/Setup/SetupHelperTest.php
index 32955ca7e4..93d68347a8 100644
--- a/tests/unit/Setup/SetupHelperTest.php
+++ b/tests/unit/Setup/SetupHelperTest.php
@@ -31,4 +31,17 @@ final class SetupHelperTest extends AbstractTestCase
         self::assertSame($expected, $configFile->getPersistKeysMap());
         self::assertNotSame($configFile, SetupHelper::createConfigFile());
     }
+
+    public function testGetPages(): void
+    {
+        $expected = [
+            'Export' => ['name' => 'Export', 'formset' => 'Export'],
+            'Features' => ['name' => 'Features', 'formset' => 'Features'],
+            'Import' => ['name' => 'Import', 'formset' => 'Import'],
+            'Main' => ['name' => 'Main panel', 'formset' => 'Main'],
+            'Navi' => ['name' => 'Navigation panel', 'formset' => 'Navi'],
+            'Sql' => ['name' => 'SQL queries', 'formset' => 'Sql'],
+        ];
+        self::assertSame($expected, SetupHelper::getPages());
+    }
 }

From 0a681ea9ed7dc04701746012636aa20477211105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sat, 11 May 2024 15:25:06 -0300
Subject: [PATCH 6/9] Make all setup controllers implement InvocableController
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 app/services_controllers.php                  |  2 +-
 src/Controllers/Setup/ConfigController.php    | 24 +++++++++----
 src/Controllers/Setup/FormController.php      | 28 ++++++++++-----
 src/Controllers/Setup/HomeController.php      | 24 +++++++++----
 src/Controllers/Setup/MainController.php      | 35 ++++++-------------
 .../Setup/ServerDestroyController.php         | 30 +++++++++++++---
 src/Controllers/Setup/ServersController.php   | 24 +++++++++----
 7 files changed, 110 insertions(+), 57 deletions(-)

diff --git a/app/services_controllers.php b/app/services_controllers.php
index d8983f7e2a..167bc5c7ab 100644
--- a/app/services_controllers.php
+++ b/app/services_controllers.php
@@ -869,7 +869,7 @@ return [
         ],
         Setup\MainController::class => [
             'class' => Setup\MainController::class,
-            'arguments' => ['@' . ResponseFactory::class, '@template', '@console'],
+            'arguments' => ['@' . ResponseFactory::class, '@response', '@template'],
         ],
         Setup\ShowConfigController::class => [
             'class' => Setup\ShowConfigController::class,
diff --git a/src/Controllers/Setup/ConfigController.php b/src/Controllers/Setup/ConfigController.php
index a136e88089..12e6a7857f 100644
--- a/src/Controllers/Setup/ConfigController.php
+++ b/src/Controllers/Setup/ConfigController.php
@@ -4,21 +4,33 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Setup;
 
+use PhpMyAdmin\Controllers\InvocableController;
+use PhpMyAdmin\Http\Factory\ResponseFactory;
+use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
+use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Setup\ConfigGenerator;
 use PhpMyAdmin\Setup\SetupHelper;
 use PhpMyAdmin\Template;
 
 use function is_string;
 
-final class ConfigController
+final class ConfigController implements InvocableController
 {
-    public function __construct(private readonly Template $template)
-    {
+    public function __construct(
+        private readonly ResponseFactory $responseFactory,
+        private readonly ResponseRenderer $responseRenderer,
+        private readonly Template $template,
+    ) {
     }
 
-    public function __invoke(ServerRequest $request): string
+    public function __invoke(ServerRequest $request): Response
     {
+        $response = $this->responseFactory->createResponse();
+        foreach ($this->responseRenderer->getHeader()->getHttpHeaders() as $name => $value) {
+            $response = $response->withHeader($name, $value);
+        }
+
         $pages = SetupHelper::getPages();
 
         static $hasCheckPageRefresh = false;
@@ -30,13 +42,13 @@ final class ConfigController
 
         $config = ConfigGenerator::getConfigFile($configFile);
 
-        return $this->template->render('setup/config/index', [
+        return $response->write($this->template->render('setup/config/index', [
             'formset' => $this->getFormSetParam($request->getQueryParam('formset')),
             'pages' => $pages,
             'eol' => $this->getEolParam($request->getQueryParam('eol')),
             'config' => $config,
             'has_check_page_refresh' => $hasCheckPageRefresh,
-        ]);
+        ]));
     }
 
     private function getFormSetParam(mixed $formSetParam): string
diff --git a/src/Controllers/Setup/FormController.php b/src/Controllers/Setup/FormController.php
index 874fb07569..2eed3ac88a 100644
--- a/src/Controllers/Setup/FormController.php
+++ b/src/Controllers/Setup/FormController.php
@@ -5,8 +5,12 @@ declare(strict_types=1);
 namespace PhpMyAdmin\Controllers\Setup;
 
 use PhpMyAdmin\Config\Forms\Setup\SetupFormList;
+use PhpMyAdmin\Controllers\InvocableController;
+use PhpMyAdmin\Http\Factory\ResponseFactory;
+use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\LanguageManager;
+use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Setup\FormProcessing;
 use PhpMyAdmin\Setup\SetupHelper;
 use PhpMyAdmin\Template;
@@ -16,25 +20,33 @@ use function is_string;
 use function ob_get_clean;
 use function ob_start;
 
-final class FormController
+final class FormController implements InvocableController
 {
-    public function __construct(private readonly Template $template)
-    {
+    public function __construct(
+        private readonly ResponseFactory $responseFactory,
+        private readonly ResponseRenderer $responseRenderer,
+        private readonly Template $template,
+    ) {
     }
 
-    public function __invoke(ServerRequest $request): string
+    public function __invoke(ServerRequest $request): Response
     {
+        $response = $this->responseFactory->createResponse();
+        foreach ($this->responseRenderer->getHeader()->getHttpHeaders() as $name => $value) {
+            $response = $response->withHeader($name, $value);
+        }
+
         $pages = SetupHelper::getPages();
 
         $formSet = $this->getFormSetParam($request->getQueryParam('formset'));
 
         $formClass = SetupFormList::get($formSet);
         if ($formClass === null) {
-            return $this->template->render('error/generic', [
+            return $response->write($this->template->render('error/generic', [
                 'lang' => $GLOBALS['lang'] ?? 'en',
                 'dir' => LanguageManager::$textDir,
                 'error_message' => __('Incorrect form specified!'),
-            ]);
+            ]));
         }
 
         $configFile = SetupHelper::createConfigFile();
@@ -44,12 +56,12 @@ final class FormController
         FormProcessing::process($form);
         $page = ob_get_clean();
 
-        return $this->template->render('setup/form/index', [
+        return $response->write($this->template->render('setup/form/index', [
             'formset' => $formSet,
             'pages' => $pages,
             'name' => $form::getName(),
             'page' => $page,
-        ]);
+        ]));
     }
 
     private function getFormSetParam(mixed $formSetParam): string
diff --git a/src/Controllers/Setup/HomeController.php b/src/Controllers/Setup/HomeController.php
index 0f44fc140e..e9188326cf 100644
--- a/src/Controllers/Setup/HomeController.php
+++ b/src/Controllers/Setup/HomeController.php
@@ -6,8 +6,12 @@ namespace PhpMyAdmin\Controllers\Setup;
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\ServerConfigChecks;
+use PhpMyAdmin\Controllers\InvocableController;
+use PhpMyAdmin\Http\Factory\ResponseFactory;
+use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\LanguageManager;
+use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Setup\Index;
 use PhpMyAdmin\Setup\SetupHelper;
 use PhpMyAdmin\Template;
@@ -17,14 +21,22 @@ use function array_keys;
 use function is_scalar;
 use function is_string;
 
-final class HomeController
+final class HomeController implements InvocableController
 {
-    public function __construct(private readonly Template $template)
-    {
+    public function __construct(
+        private readonly ResponseFactory $responseFactory,
+        private readonly ResponseRenderer $responseRenderer,
+        private readonly Template $template,
+    ) {
     }
 
-    public function __invoke(ServerRequest $request): string
+    public function __invoke(ServerRequest $request): Response
     {
+        $response = $this->responseFactory->createResponse();
+        foreach ($this->responseRenderer->getHeader()->getHttpHeaders() as $name => $value) {
+            $response = $response->withHeader($name, $value);
+        }
+
         $pages = SetupHelper::getPages();
 
         // message handling
@@ -87,7 +99,7 @@ final class HomeController
             $hasCheckPageRefresh = true;
         }
 
-        return $this->template->render('setup/home/index', [
+        return $response->write($this->template->render('setup/home/index', [
             'formset' => $this->getFormSetParam($request->getQueryParam('formset')),
             'languages' => $languages,
             'messages' => $messages,
@@ -98,7 +110,7 @@ final class HomeController
             'eol' => isset($_SESSION['eol']) && is_scalar($_SESSION['eol'])
                 ? $_SESSION['eol']
                 : (Config::getInstance()->get('PMA_IS_WINDOWS') ? 'win' : 'unix'),
-        ]);
+        ]));
     }
 
     private function getFormSetParam(mixed $formSetParam): string
diff --git a/src/Controllers/Setup/MainController.php b/src/Controllers/Setup/MainController.php
index 64a90d9610..287b6072e9 100644
--- a/src/Controllers/Setup/MainController.php
+++ b/src/Controllers/Setup/MainController.php
@@ -6,15 +6,13 @@ namespace PhpMyAdmin\Controllers\Setup;
 
 use Fig\Http\Message\StatusCodeInterface;
 use PhpMyAdmin\Config;
-use PhpMyAdmin\Console;
 use PhpMyAdmin\Controllers\InvocableController;
-use PhpMyAdmin\Header;
 use PhpMyAdmin\Http\Factory\ResponseFactory;
 use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\LanguageManager;
+use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Template;
-use PhpMyAdmin\Url;
 
 use function __;
 use function file_exists;
@@ -26,8 +24,8 @@ final class MainController implements InvocableController
 {
     public function __construct(
         private readonly ResponseFactory $responseFactory,
+        private readonly ResponseRenderer $responseRenderer,
         private readonly Template $template,
-        private readonly Console $console,
     ) {
     }
 
@@ -48,35 +46,22 @@ final class MainController implements InvocableController
         $pageParam = $request->getQueryParam('page');
         $page = in_array($pageParam, ['form', 'config', 'servers'], true) ? $pageParam : 'index';
 
-        $response = $this->responseFactory->createResponse();
-        $header = new Header($this->template, $this->console, $config);
-        foreach ($header->getHttpHeaders() as $name => $value) {
-            // Sent security-related headers
-            $response = $response->withHeader($name, $value);
-        }
-
         if ($page === 'form') {
-            return $response->write((new FormController($this->template))($request));
+            return (new FormController($this->responseFactory, $this->responseRenderer, $this->template))($request);
         }
 
         if ($page === 'config') {
-            return $response->write((new ConfigController($this->template))($request));
+            return (new ConfigController($this->responseFactory, $this->responseRenderer, $this->template))($request);
+        }
+
+        if ($page === 'servers' && $request->getQueryParam('mode') === 'remove' && $request->isPost()) {
+            return (new ServerDestroyController($this->responseFactory, $this->responseRenderer))($request);
         }
 
         if ($page === 'servers') {
-            if ($request->getQueryParam('mode') === 'remove' && $request->isPost()) {
-                (new ServerDestroyController())($request);
-                $response = $response->withStatus(StatusCodeInterface::STATUS_FOUND);
-
-                return $response->withHeader(
-                    'Location',
-                    '../setup/index.php' . Url::getCommonRaw(['route' => '/setup']),
-                );
-            }
-
-            return $response->write((new ServersController($this->template))($request));
+            return (new ServersController($this->responseFactory, $this->responseRenderer, $this->template))($request);
         }
 
-        return $response->write((new HomeController($this->template))($request));
+        return (new HomeController($this->responseFactory, $this->responseRenderer, $this->template))($request);
     }
 }
diff --git a/src/Controllers/Setup/ServerDestroyController.php b/src/Controllers/Setup/ServerDestroyController.php
index 5a0607c086..9cb0d3be2f 100644
--- a/src/Controllers/Setup/ServerDestroyController.php
+++ b/src/Controllers/Setup/ServerDestroyController.php
@@ -4,24 +4,44 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Setup;
 
+use Fig\Http\Message\StatusCodeInterface;
+use PhpMyAdmin\Controllers\InvocableController;
+use PhpMyAdmin\Http\Factory\ResponseFactory;
+use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
+use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Setup\SetupHelper;
+use PhpMyAdmin\Url;
 
 use function is_numeric;
 
-final class ServerDestroyController
+final class ServerDestroyController implements InvocableController
 {
-    public function __invoke(ServerRequest $request): void
+    public function __construct(
+        private readonly ResponseFactory $responseFactory,
+        private readonly ResponseRenderer $responseRenderer,
+    ) {
+    }
+
+    public function __invoke(ServerRequest $request): Response
     {
+        $response = $this->responseFactory->createResponse();
+        foreach ($this->responseRenderer->getHeader()->getHttpHeaders() as $name => $value) {
+            $response = $response->withHeader($name, $value);
+        }
+
         $configFile = SetupHelper::createConfigFile();
 
         $id = $this->getIdParam($request->getQueryParam('id'));
         $hasServer = $id >= 1 && $configFile->get('Servers/' . $id) !== null;
-        if (! $hasServer) {
-            return;
+        if ($hasServer) {
+            $configFile->removeServer($id);
         }
 
-        $configFile->removeServer($id);
+        return $response->withStatus(StatusCodeInterface::STATUS_FOUND)->withHeader(
+            'Location',
+            '../setup/index.php' . Url::getCommonRaw(['route' => '/setup']),
+        );
     }
 
     /** @psalm-return int<0, max> */
diff --git a/src/Controllers/Setup/ServersController.php b/src/Controllers/Setup/ServersController.php
index 00fee14e98..20a50bf49c 100644
--- a/src/Controllers/Setup/ServersController.php
+++ b/src/Controllers/Setup/ServersController.php
@@ -5,7 +5,11 @@ declare(strict_types=1);
 namespace PhpMyAdmin\Controllers\Setup;
 
 use PhpMyAdmin\Config\Forms\Setup\ServersForm;
+use PhpMyAdmin\Controllers\InvocableController;
+use PhpMyAdmin\Http\Factory\ResponseFactory;
+use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
+use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Setup\FormProcessing;
 use PhpMyAdmin\Setup\SetupHelper;
 use PhpMyAdmin\Template;
@@ -16,14 +20,22 @@ use function is_string;
 use function ob_get_clean;
 use function ob_start;
 
-final class ServersController
+final class ServersController implements InvocableController
 {
-    public function __construct(private readonly Template $template)
-    {
+    public function __construct(
+        private readonly ResponseFactory $responseFactory,
+        private readonly ResponseRenderer $responseRenderer,
+        private readonly Template $template,
+    ) {
     }
 
-    public function __invoke(ServerRequest $request): string
+    public function __invoke(ServerRequest $request): Response
     {
+        $response = $this->responseFactory->createResponse();
+        foreach ($this->responseRenderer->getHeader()->getHttpHeaders() as $name => $value) {
+            $response = $response->withHeader($name, $value);
+        }
+
         $configFile = SetupHelper::createConfigFile();
 
         $id = $this->getIdParam($request->getQueryParam('id'));
@@ -41,7 +53,7 @@ final class ServersController
         FormProcessing::process(new ServersForm($configFile, $id));
         $page = ob_get_clean();
 
-        return $this->template->render('setup/servers/index', [
+        return $response->write($this->template->render('setup/servers/index', [
             'formset' => $this->getFormSetParam($request->getQueryParam('formset')),
             'pages' => $pages,
             'has_server' => $hasServer,
@@ -49,7 +61,7 @@ final class ServersController
             'server_id' => $id,
             'server_dsn' => $configFile->getServerDSN($id),
             'page' => $page,
-        ]);
+        ]));
     }
 
     private function getFormSetParam(mixed $formSetParam): string

From 126ac3ac5662ed3171ef3646636348fad3f8e952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sat, 11 May 2024 16:28:09 -0300
Subject: [PATCH 7/9] Move check if setup is enabled to each setup controller
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes it from the Setup\MainController as it will be removed in the
future.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 app/services_controllers.php                  |  6 +-
 phpstan-baseline.neon                         | 32 +++++++++-
 psalm-baseline.xml                            |  8 +--
 src/Controllers/Setup/ConfigController.php    | 18 ++++++
 src/Controllers/Setup/FormController.php      | 16 +++++
 src/Controllers/Setup/HomeController.php      | 17 ++++-
 src/Controllers/Setup/MainController.php      | 64 +++++++++++--------
 .../Setup/ServerDestroyController.php         | 19 ++++++
 src/Controllers/Setup/ServersController.php   | 18 ++++++
 .../Setup/ShowConfigController.php            | 26 +++++++-
 src/Controllers/Setup/ValidateController.php  | 24 ++++++-
 11 files changed, 206 insertions(+), 42 deletions(-)

diff --git a/app/services_controllers.php b/app/services_controllers.php
index 167bc5c7ab..73aa52a4d3 100644
--- a/app/services_controllers.php
+++ b/app/services_controllers.php
@@ -869,15 +869,15 @@ return [
         ],
         Setup\MainController::class => [
             'class' => Setup\MainController::class,
-            'arguments' => ['@' . ResponseFactory::class, '@response', '@template'],
+            'arguments' => ['@' . ResponseFactory::class, '@response', '@template', '@config'],
         ],
         Setup\ShowConfigController::class => [
             'class' => Setup\ShowConfigController::class,
-            'arguments' => ['@response'],
+            'arguments' => ['@' . ResponseFactory::class, '@response', '@template', '@config'],
         ],
         Setup\ValidateController::class => [
             'class' => Setup\ValidateController::class,
-            'arguments' => ['@' . ResponseFactory::class],
+            'arguments' => ['@' . ResponseFactory::class, '@template', '@config'],
         ],
         Sql\ColumnPreferencesController::class => [
             'class' => Sql\ColumnPreferencesController::class,
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index cd0c8989b0..5e44eb4ca1 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -3655,11 +3655,26 @@ parameters:
 			count: 1
 			path: src/Controllers/Server/Variables/SetVariableController.php
 
+		-
+			message: "#^Parameter \\#1 \\$filename of function file_exists expects string, mixed given\\.$#"
+			count: 1
+			path: src/Controllers/Setup/ConfigController.php
+
+		-
+			message: "#^Parameter \\#1 \\$filename of function file_exists expects string, mixed given\\.$#"
+			count: 1
+			path: src/Controllers/Setup/FormController.php
+
 		-
 			message: "#^Only booleans are allowed in a ternary operator condition, mixed given\\.$#"
 			count: 1
 			path: src/Controllers/Setup/HomeController.php
 
+		-
+			message: "#^Parameter \\#1 \\$filename of function file_exists expects string, mixed given\\.$#"
+			count: 1
+			path: src/Controllers/Setup/HomeController.php
+
 		-
 			message: "#^Parameter \\#1 \\$id of method PhpMyAdmin\\\\Config\\\\ConfigFile\\:\\:getServerName\\(\\) expects int, \\(int\\|string\\) given\\.$#"
 			count: 1
@@ -3673,7 +3688,22 @@ parameters:
 		-
 			message: "#^Parameter \\#1 \\$filename of function file_exists expects string, mixed given\\.$#"
 			count: 1
-			path: src/Controllers/Setup/MainController.php
+			path: src/Controllers/Setup/ServerDestroyController.php
+
+		-
+			message: "#^Parameter \\#1 \\$filename of function file_exists expects string, mixed given\\.$#"
+			count: 1
+			path: src/Controllers/Setup/ServersController.php
+
+		-
+			message: "#^Parameter \\#1 \\$filename of function file_exists expects string, mixed given\\.$#"
+			count: 1
+			path: src/Controllers/Setup/ShowConfigController.php
+
+		-
+			message: "#^Parameter \\#1 \\$filename of function file_exists expects string, mixed given\\.$#"
+			count: 1
+			path: src/Controllers/Setup/ValidateController.php
 
 		-
 			message: "#^Cannot cast mixed to string\\.$#"
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index c4054e6381..b4e70b8510 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -3000,21 +3000,15 @@
     </PossiblyUnusedReturnValue>
   </file>
   <file src="src/Controllers/Setup/HomeController.php">
-    <DeprecatedMethod>
-      <code><![CDATA[Config::getInstance()]]></code>
-    </DeprecatedMethod>
     <MixedArgumentTypeCoercion>
       <code><![CDATA[$id]]></code>
       <code><![CDATA[$id]]></code>
     </MixedArgumentTypeCoercion>
     <RiskyTruthyFalsyComparison>
-      <code><![CDATA[Config::getInstance()->get('PMA_IS_WINDOWS')]]></code>
+      <code><![CDATA[$this->config->get('PMA_IS_WINDOWS')]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Controllers/Setup/MainController.php">
-    <DeprecatedMethod>
-      <code><![CDATA[Config::getInstance()]]></code>
-    </DeprecatedMethod>
     <PossiblyUnusedMethod>
       <code><![CDATA[__construct]]></code>
     </PossiblyUnusedMethod>
diff --git a/src/Controllers/Setup/ConfigController.php b/src/Controllers/Setup/ConfigController.php
index 12e6a7857f..ccab6a2b3f 100644
--- a/src/Controllers/Setup/ConfigController.php
+++ b/src/Controllers/Setup/ConfigController.php
@@ -4,28 +4,46 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Setup;
 
+use Fig\Http\Message\StatusCodeInterface;
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Controllers\InvocableController;
 use PhpMyAdmin\Http\Factory\ResponseFactory;
 use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
+use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Setup\ConfigGenerator;
 use PhpMyAdmin\Setup\SetupHelper;
 use PhpMyAdmin\Template;
 
+use function __;
+use function file_exists;
 use function is_string;
 
+use const CONFIG_FILE;
+
 final class ConfigController implements InvocableController
 {
     public function __construct(
         private readonly ResponseFactory $responseFactory,
         private readonly ResponseRenderer $responseRenderer,
         private readonly Template $template,
+        private readonly Config $config,
     ) {
     }
 
     public function __invoke(ServerRequest $request): Response
     {
+        if (@file_exists(CONFIG_FILE) && ! $this->config->config->debug->demo) {
+            $response = $this->responseFactory->createResponse(StatusCodeInterface::STATUS_NOT_FOUND);
+
+            return $response->write($this->template->render('error/generic', [
+                'lang' => $GLOBALS['lang'] ?? 'en',
+                'dir' => LanguageManager::$textDir,
+                'error_message' => __('Configuration already exists, setup is disabled!'),
+            ]));
+        }
+
         $response = $this->responseFactory->createResponse();
         foreach ($this->responseRenderer->getHeader()->getHttpHeaders() as $name => $value) {
             $response = $response->withHeader($name, $value);
diff --git a/src/Controllers/Setup/FormController.php b/src/Controllers/Setup/FormController.php
index 2eed3ac88a..46430f3f7b 100644
--- a/src/Controllers/Setup/FormController.php
+++ b/src/Controllers/Setup/FormController.php
@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Setup;
 
+use Fig\Http\Message\StatusCodeInterface;
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\Forms\Setup\SetupFormList;
 use PhpMyAdmin\Controllers\InvocableController;
 use PhpMyAdmin\Http\Factory\ResponseFactory;
@@ -16,21 +18,35 @@ use PhpMyAdmin\Setup\SetupHelper;
 use PhpMyAdmin\Template;
 
 use function __;
+use function file_exists;
 use function is_string;
 use function ob_get_clean;
 use function ob_start;
 
+use const CONFIG_FILE;
+
 final class FormController implements InvocableController
 {
     public function __construct(
         private readonly ResponseFactory $responseFactory,
         private readonly ResponseRenderer $responseRenderer,
         private readonly Template $template,
+        private readonly Config $config,
     ) {
     }
 
     public function __invoke(ServerRequest $request): Response
     {
+        if (@file_exists(CONFIG_FILE) && ! $this->config->config->debug->demo) {
+            $response = $this->responseFactory->createResponse(StatusCodeInterface::STATUS_NOT_FOUND);
+
+            return $response->write($this->template->render('error/generic', [
+                'lang' => $GLOBALS['lang'] ?? 'en',
+                'dir' => LanguageManager::$textDir,
+                'error_message' => __('Configuration already exists, setup is disabled!'),
+            ]));
+        }
+
         $response = $this->responseFactory->createResponse();
         foreach ($this->responseRenderer->getHeader()->getHttpHeaders() as $name => $value) {
             $response = $response->withHeader($name, $value);
diff --git a/src/Controllers/Setup/HomeController.php b/src/Controllers/Setup/HomeController.php
index e9188326cf..8b1cb2e4e8 100644
--- a/src/Controllers/Setup/HomeController.php
+++ b/src/Controllers/Setup/HomeController.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Setup;
 
+use Fig\Http\Message\StatusCodeInterface;
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\ServerConfigChecks;
 use PhpMyAdmin\Controllers\InvocableController;
@@ -18,20 +19,34 @@ use PhpMyAdmin\Template;
 
 use function __;
 use function array_keys;
+use function file_exists;
 use function is_scalar;
 use function is_string;
 
+use const CONFIG_FILE;
+
 final class HomeController implements InvocableController
 {
     public function __construct(
         private readonly ResponseFactory $responseFactory,
         private readonly ResponseRenderer $responseRenderer,
         private readonly Template $template,
+        private readonly Config $config,
     ) {
     }
 
     public function __invoke(ServerRequest $request): Response
     {
+        if (@file_exists(CONFIG_FILE) && ! $this->config->config->debug->demo) {
+            $response = $this->responseFactory->createResponse(StatusCodeInterface::STATUS_NOT_FOUND);
+
+            return $response->write($this->template->render('error/generic', [
+                'lang' => $GLOBALS['lang'] ?? 'en',
+                'dir' => LanguageManager::$textDir,
+                'error_message' => __('Configuration already exists, setup is disabled!'),
+            ]));
+        }
+
         $response = $this->responseFactory->createResponse();
         foreach ($this->responseRenderer->getHeader()->getHttpHeaders() as $name => $value) {
             $response = $response->withHeader($name, $value);
@@ -109,7 +124,7 @@ final class HomeController implements InvocableController
             'has_check_page_refresh' => $hasCheckPageRefresh,
             'eol' => isset($_SESSION['eol']) && is_scalar($_SESSION['eol'])
                 ? $_SESSION['eol']
-                : (Config::getInstance()->get('PMA_IS_WINDOWS') ? 'win' : 'unix'),
+                : ($this->config->get('PMA_IS_WINDOWS') ? 'win' : 'unix'),
         ]));
     }
 
diff --git a/src/Controllers/Setup/MainController.php b/src/Controllers/Setup/MainController.php
index 287b6072e9..9a92e06e56 100644
--- a/src/Controllers/Setup/MainController.php
+++ b/src/Controllers/Setup/MainController.php
@@ -4,64 +4,76 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Setup;
 
-use Fig\Http\Message\StatusCodeInterface;
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Controllers\InvocableController;
 use PhpMyAdmin\Http\Factory\ResponseFactory;
 use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
-use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Template;
 
-use function __;
-use function file_exists;
 use function in_array;
 
-use const CONFIG_FILE;
-
 final class MainController implements InvocableController
 {
     public function __construct(
         private readonly ResponseFactory $responseFactory,
         private readonly ResponseRenderer $responseRenderer,
         private readonly Template $template,
+        private readonly Config $config,
     ) {
     }
 
     public function __invoke(ServerRequest $request): Response
     {
-        $config = Config::getInstance();
-        if (@file_exists(CONFIG_FILE) && ! $config->config->debug->demo) {
-            $response = $this->responseFactory->createResponse(StatusCodeInterface::STATUS_NOT_FOUND);
-
-            return $response->write($this->template->render('error/generic', [
-                'lang' => $GLOBALS['lang'] ?? 'en',
-                'dir' => LanguageManager::$textDir,
-                'error_message' => __('Configuration already exists, setup is disabled!'),
-            ]));
-        }
-
-        /** @var mixed $pageParam */
-        $pageParam = $request->getQueryParam('page');
-        $page = in_array($pageParam, ['form', 'config', 'servers'], true) ? $pageParam : 'index';
-
+        $page = $this->getPageParam($request->getQueryParam('page'));
         if ($page === 'form') {
-            return (new FormController($this->responseFactory, $this->responseRenderer, $this->template))($request);
+            return (new FormController(
+                $this->responseFactory,
+                $this->responseRenderer,
+                $this->template,
+                $this->config,
+            ))($request);
         }
 
         if ($page === 'config') {
-            return (new ConfigController($this->responseFactory, $this->responseRenderer, $this->template))($request);
+            return (new ConfigController(
+                $this->responseFactory,
+                $this->responseRenderer,
+                $this->template,
+                $this->config,
+            ))($request);
         }
 
         if ($page === 'servers' && $request->getQueryParam('mode') === 'remove' && $request->isPost()) {
-            return (new ServerDestroyController($this->responseFactory, $this->responseRenderer))($request);
+            return (new ServerDestroyController(
+                $this->responseFactory,
+                $this->responseRenderer,
+                $this->template,
+                $this->config,
+            ))($request);
         }
 
         if ($page === 'servers') {
-            return (new ServersController($this->responseFactory, $this->responseRenderer, $this->template))($request);
+            return (new ServersController(
+                $this->responseFactory,
+                $this->responseRenderer,
+                $this->template,
+                $this->config,
+            ))($request);
         }
 
-        return (new HomeController($this->responseFactory, $this->responseRenderer, $this->template))($request);
+        return (new HomeController(
+            $this->responseFactory,
+            $this->responseRenderer,
+            $this->template,
+            $this->config,
+        ))($request);
+    }
+
+    /** @psalm-return 'form'|'config'|'servers'|'index' */
+    private function getPageParam(mixed $pageParam): string
+    {
+        return in_array($pageParam, ['form', 'config', 'servers'], true) ? $pageParam : 'index';
     }
 }
diff --git a/src/Controllers/Setup/ServerDestroyController.php b/src/Controllers/Setup/ServerDestroyController.php
index 9cb0d3be2f..03f344a533 100644
--- a/src/Controllers/Setup/ServerDestroyController.php
+++ b/src/Controllers/Setup/ServerDestroyController.php
@@ -5,26 +5,45 @@ declare(strict_types=1);
 namespace PhpMyAdmin\Controllers\Setup;
 
 use Fig\Http\Message\StatusCodeInterface;
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Controllers\InvocableController;
 use PhpMyAdmin\Http\Factory\ResponseFactory;
 use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
+use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Setup\SetupHelper;
+use PhpMyAdmin\Template;
 use PhpMyAdmin\Url;
 
+use function __;
+use function file_exists;
 use function is_numeric;
 
+use const CONFIG_FILE;
+
 final class ServerDestroyController implements InvocableController
 {
     public function __construct(
         private readonly ResponseFactory $responseFactory,
         private readonly ResponseRenderer $responseRenderer,
+        private readonly Template $template,
+        private readonly Config $config,
     ) {
     }
 
     public function __invoke(ServerRequest $request): Response
     {
+        if (@file_exists(CONFIG_FILE) && ! $this->config->config->debug->demo) {
+            $response = $this->responseFactory->createResponse(StatusCodeInterface::STATUS_NOT_FOUND);
+
+            return $response->write($this->template->render('error/generic', [
+                'lang' => $GLOBALS['lang'] ?? 'en',
+                'dir' => LanguageManager::$textDir,
+                'error_message' => __('Configuration already exists, setup is disabled!'),
+            ]));
+        }
+
         $response = $this->responseFactory->createResponse();
         foreach ($this->responseRenderer->getHeader()->getHttpHeaders() as $name => $value) {
             $response = $response->withHeader($name, $value);
diff --git a/src/Controllers/Setup/ServersController.php b/src/Controllers/Setup/ServersController.php
index 20a50bf49c..adf4989d2e 100644
--- a/src/Controllers/Setup/ServersController.php
+++ b/src/Controllers/Setup/ServersController.php
@@ -4,33 +4,51 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Setup;
 
+use Fig\Http\Message\StatusCodeInterface;
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\Forms\Setup\ServersForm;
 use PhpMyAdmin\Controllers\InvocableController;
 use PhpMyAdmin\Http\Factory\ResponseFactory;
 use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
+use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Setup\FormProcessing;
 use PhpMyAdmin\Setup\SetupHelper;
 use PhpMyAdmin\Template;
 
+use function __;
+use function file_exists;
 use function in_array;
 use function is_numeric;
 use function is_string;
 use function ob_get_clean;
 use function ob_start;
 
+use const CONFIG_FILE;
+
 final class ServersController implements InvocableController
 {
     public function __construct(
         private readonly ResponseFactory $responseFactory,
         private readonly ResponseRenderer $responseRenderer,
         private readonly Template $template,
+        private readonly Config $config,
     ) {
     }
 
     public function __invoke(ServerRequest $request): Response
     {
+        if (@file_exists(CONFIG_FILE) && ! $this->config->config->debug->demo) {
+            $response = $this->responseFactory->createResponse(StatusCodeInterface::STATUS_NOT_FOUND);
+
+            return $response->write($this->template->render('error/generic', [
+                'lang' => $GLOBALS['lang'] ?? 'en',
+                'dir' => LanguageManager::$textDir,
+                'error_message' => __('Configuration already exists, setup is disabled!'),
+            ]));
+        }
+
         $response = $this->responseFactory->createResponse();
         foreach ($this->responseRenderer->getHeader()->getHttpHeaders() as $name => $value) {
             $response = $response->withHeader($name, $value);
diff --git a/src/Controllers/Setup/ShowConfigController.php b/src/Controllers/Setup/ShowConfigController.php
index 4373e3b66d..c051c41bb7 100644
--- a/src/Controllers/Setup/ShowConfigController.php
+++ b/src/Controllers/Setup/ShowConfigController.php
@@ -5,26 +5,48 @@ declare(strict_types=1);
 namespace PhpMyAdmin\Controllers\Setup;
 
 use Fig\Http\Message\StatusCodeInterface;
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\Forms\Setup\ConfigForm;
 use PhpMyAdmin\Controllers\InvocableController;
 use PhpMyAdmin\Core;
+use PhpMyAdmin\Http\Factory\ResponseFactory;
 use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
+use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Setup\ConfigGenerator;
 use PhpMyAdmin\Setup\SetupHelper;
+use PhpMyAdmin\Template;
 use PhpMyAdmin\Url;
 
+use function __;
+use function file_exists;
 use function is_string;
 
+use const CONFIG_FILE;
+
 final class ShowConfigController implements InvocableController
 {
-    public function __construct(private readonly ResponseRenderer $responseRenderer)
-    {
+    public function __construct(
+        private readonly ResponseFactory $responseFactory,
+        private readonly ResponseRenderer $responseRenderer,
+        private readonly Template $template,
+        private readonly Config $config,
+    ) {
     }
 
     public function __invoke(ServerRequest $request): Response
     {
+        if (@file_exists(CONFIG_FILE) && ! $this->config->config->debug->demo) {
+            $response = $this->responseFactory->createResponse(StatusCodeInterface::STATUS_NOT_FOUND);
+
+            return $response->write($this->template->render('error/generic', [
+                'lang' => $GLOBALS['lang'] ?? 'en',
+                'dir' => LanguageManager::$textDir,
+                'error_message' => __('Configuration already exists, setup is disabled!'),
+            ]));
+        }
+
         $configFile = SetupHelper::createConfigFile();
 
         $formDisplay = new ConfigForm($configFile);
diff --git a/src/Controllers/Setup/ValidateController.php b/src/Controllers/Setup/ValidateController.php
index e7247be248..67bd9a0fee 100644
--- a/src/Controllers/Setup/ValidateController.php
+++ b/src/Controllers/Setup/ValidateController.php
@@ -4,31 +4,51 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Setup;
 
+use Fig\Http\Message\StatusCodeInterface;
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\Validator;
 use PhpMyAdmin\Controllers\InvocableController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Http\Factory\ResponseFactory;
 use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
+use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Setup\SetupHelper;
+use PhpMyAdmin\Template;
 use stdClass;
 
 use function __;
 use function explode;
+use function file_exists;
 use function implode;
 use function is_string;
 use function json_decode;
 use function json_encode;
 use function sprintf;
 
+use const CONFIG_FILE;
+
 final class ValidateController implements InvocableController
 {
-    public function __construct(private readonly ResponseFactory $responseFactory)
-    {
+    public function __construct(
+        private readonly ResponseFactory $responseFactory,
+        private readonly Template $template,
+        private readonly Config $config,
+    ) {
     }
 
     public function __invoke(ServerRequest $request): Response
     {
+        if (@file_exists(CONFIG_FILE) && ! $this->config->config->debug->demo) {
+            $response = $this->responseFactory->createResponse(StatusCodeInterface::STATUS_NOT_FOUND);
+
+            return $response->write($this->template->render('error/generic', [
+                'lang' => $GLOBALS['lang'] ?? 'en',
+                'dir' => LanguageManager::$textDir,
+                'error_message' => __('Configuration already exists, setup is disabled!'),
+            ]));
+        }
+
         $response = $this->responseFactory->createResponse();
         foreach (Core::headerJSON() as $name => $value) {
             $response = $response->withHeader($name, $value);

From de7572b9145a5c21b3bd9e150fb2dce39343fcde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sat, 11 May 2024 17:35:37 -0300
Subject: [PATCH 8/9] Inline and remove the Setup\FormProcessing class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This helps with the response handling.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 psalm-baseline.xml                          |   5 -
 src/Controllers/Setup/FormController.php    |  68 +++++++++--
 src/Controllers/Setup/ServersController.php |  58 ++++++++--
 src/Setup/FormProcessing.php                |  76 -------------
 tests/unit/Setup/FormProcessingTest.php     | 119 --------------------
 5 files changed, 109 insertions(+), 217 deletions(-)
 delete mode 100644 src/Setup/FormProcessing.php
 delete mode 100644 tests/unit/Setup/FormProcessingTest.php

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index b4e70b8510..24f57bbdae 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -14675,11 +14675,6 @@
       <code><![CDATA[$result]]></code>
     </MixedAssignment>
   </file>
-  <file src="tests/unit/Setup/FormProcessingTest.php">
-    <DeprecatedMethod>
-      <code><![CDATA[Config::getInstance()]]></code>
-    </DeprecatedMethod>
-  </file>
   <file src="tests/unit/Setup/IndexTest.php">
     <DeprecatedMethod>
       <code><![CDATA[Config::getInstance()]]></code>
diff --git a/src/Controllers/Setup/FormController.php b/src/Controllers/Setup/FormController.php
index 46430f3f7b..2a6d211df6 100644
--- a/src/Controllers/Setup/FormController.php
+++ b/src/Controllers/Setup/FormController.php
@@ -13,15 +13,15 @@ use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\ResponseRenderer;
-use PhpMyAdmin\Setup\FormProcessing;
 use PhpMyAdmin\Setup\SetupHelper;
 use PhpMyAdmin\Template;
+use PhpMyAdmin\Url;
 
 use function __;
 use function file_exists;
+use function in_array;
+use function is_numeric;
 use function is_string;
-use function ob_get_clean;
-use function ob_start;
 
 use const CONFIG_FILE;
 
@@ -66,17 +66,49 @@ final class FormController implements InvocableController
         }
 
         $configFile = SetupHelper::createConfigFile();
+        $formDisplay = new $formClass($configFile);
 
-        ob_start();
-        $form = new $formClass($configFile);
-        FormProcessing::process($form);
-        $page = ob_get_clean();
+        if ($request->getQueryParam('mode') === 'revert') {
+            // revert erroneous fields to their default values
+            $formDisplay->fixErrors();
+
+            return $response->withStatus(StatusCodeInterface::STATUS_FOUND)
+                ->withHeader('Location', '../setup/index.php' . Url::getCommonRaw(['route' => '/setup']));
+        }
+
+        if (! $formDisplay->process(false)) {
+            // handle form view and failed POST
+            return $response->write($this->template->render('setup/form/index', [
+                'formset' => $formSet,
+                'pages' => $pages,
+                'name' => $formDisplay::getName(),
+                'page' => $formDisplay->getDisplay(),
+            ]));
+        }
+
+        // check for form errors
+        if (! $formDisplay->hasErrors()) {
+            return $response->withStatus(StatusCodeInterface::STATUS_FOUND)
+                ->withHeader('Location', '../setup/index.php' . Url::getCommonRaw(['route' => '/setup']));
+        }
+
+        $page = $this->getPageParam($request->getQueryParam('page'));
+        $id = $this->getIdParam($request->getQueryParam('id'));
+        if ($id === 0 && $page === 'servers') {
+            // we've just added a new server, get its id
+            $id = $formDisplay->getConfigFile()->getServerCount();
+        }
+
+        $errors = $this->template->render('setup/error', [
+            'url_params' => ['page' => $page, 'formset' => $formSet, 'id' => $id],
+            'errors' => $formDisplay->displayErrors(),
+        ]);
 
         return $response->write($this->template->render('setup/form/index', [
             'formset' => $formSet,
             'pages' => $pages,
-            'name' => $form::getName(),
-            'page' => $page,
+            'name' => $formDisplay::getName(),
+            'page' => $errors,
         ]));
     }
 
@@ -84,4 +116,22 @@ final class FormController implements InvocableController
     {
         return is_string($formSetParam) ? $formSetParam : '';
     }
+
+    /** @psalm-return 'form'|'config'|'servers'|'index' */
+    private function getPageParam(mixed $pageParam): string
+    {
+        return in_array($pageParam, ['form', 'config', 'servers'], true) ? $pageParam : 'index';
+    }
+
+    /** @psalm-return int<0, max> */
+    private function getIdParam(mixed $idParam): int
+    {
+        if (! is_numeric($idParam)) {
+            return 0;
+        }
+
+        $id = (int) $idParam;
+
+        return $id >= 1 ? $id : 0;
+    }
 }
diff --git a/src/Controllers/Setup/ServersController.php b/src/Controllers/Setup/ServersController.php
index adf4989d2e..01c70af115 100644
--- a/src/Controllers/Setup/ServersController.php
+++ b/src/Controllers/Setup/ServersController.php
@@ -13,17 +13,15 @@ use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\ResponseRenderer;
-use PhpMyAdmin\Setup\FormProcessing;
 use PhpMyAdmin\Setup\SetupHelper;
 use PhpMyAdmin\Template;
+use PhpMyAdmin\Url;
 
 use function __;
 use function file_exists;
 use function in_array;
 use function is_numeric;
 use function is_string;
-use function ob_get_clean;
-use function ob_start;
 
 use const CONFIG_FILE;
 
@@ -67,18 +65,56 @@ final class ServersController implements InvocableController
             $id = 0;
         }
 
-        ob_start();
-        FormProcessing::process(new ServersForm($configFile, $id));
-        $page = ob_get_clean();
+        $formDisplay = new ServersForm($configFile, $id);
+
+        if ($mode === 'revert') {
+            // revert erroneous fields to their default values
+            $formDisplay->fixErrors();
+
+            return $response->withStatus(StatusCodeInterface::STATUS_FOUND)
+                ->withHeader('Location', '../setup/index.php' . Url::getCommonRaw(['route' => '/setup']));
+        }
+
+        $formSet = $this->getFormSetParam($request->getQueryParam('formset'));
+
+        if (! $formDisplay->process(false)) {
+            // handle form view and failed POST
+            return $response->write($this->template->render('setup/servers/index', [
+                'formset' => $formSet,
+                'pages' => $pages,
+                'has_server' => $hasServer,
+                'mode' => $mode,
+                'server_id' => $id,
+                'server_dsn' => $configFile->getServerDSN($id),
+                'page' => $formDisplay->getDisplay(),
+            ]));
+        }
+
+        // check for form errors
+        if (! $formDisplay->hasErrors()) {
+            return $response->withStatus(StatusCodeInterface::STATUS_FOUND)
+                ->withHeader('Location', '../setup/index.php' . Url::getCommonRaw(['route' => '/setup']));
+        }
+
+        $page = $this->getPageParam($request->getQueryParam('page'));
+        if ($id === 0 && $page === 'servers') {
+            // we've just added a new server, get its id
+            $id = $formDisplay->getConfigFile()->getServerCount();
+        }
+
+        $errors = $this->template->render('setup/error', [
+            'url_params' => ['page' => $page, 'formset' => $formSet, 'id' => $id],
+            'errors' => $formDisplay->displayErrors(),
+        ]);
 
         return $response->write($this->template->render('setup/servers/index', [
-            'formset' => $this->getFormSetParam($request->getQueryParam('formset')),
+            'formset' => $formSet,
             'pages' => $pages,
             'has_server' => $hasServer,
             'mode' => $mode,
             'server_id' => $id,
             'server_dsn' => $configFile->getServerDSN($id),
-            'page' => $page,
+            'page' => $errors,
         ]));
     }
 
@@ -104,4 +140,10 @@ final class ServersController implements InvocableController
 
         return $id >= 1 ? $id : 0;
     }
+
+    /** @psalm-return 'form'|'config'|'servers'|'index' */
+    private function getPageParam(mixed $pageParam): string
+    {
+        return in_array($pageParam, ['form', 'config', 'servers'], true) ? $pageParam : 'index';
+    }
 }
diff --git a/src/Setup/FormProcessing.php b/src/Setup/FormProcessing.php
deleted file mode 100644
index eab23b74ed..0000000000
--- a/src/Setup/FormProcessing.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Formset processing library
- */
-
-declare(strict_types=1);
-
-namespace PhpMyAdmin\Setup;
-
-use Fig\Http\Message\StatusCodeInterface;
-use PhpMyAdmin\Config\FormDisplay;
-use PhpMyAdmin\ResponseRenderer;
-use PhpMyAdmin\Template;
-use PhpMyAdmin\Url;
-
-use function in_array;
-use function is_numeric;
-use function is_string;
-
-/**
- * PhpMyAdmin\Setup\FormProcessing class
- */
-class FormProcessing
-{
-    /**
-     * Processes forms registered in $form_display, handles error correction
-     *
-     * @param FormDisplay $formDisplay Form to display
-     */
-    public static function process(FormDisplay $formDisplay): void
-    {
-        if (isset($_GET['mode']) && $_GET['mode'] === 'revert') {
-            // revert erroneous fields to their default values
-            $formDisplay->fixErrors();
-            $response = ResponseRenderer::getInstance();
-            $response->disable();
-            $response->addHeader('Location', '../setup/index.php' . Url::getCommonRaw(['route' => '/setup']));
-            $response->setStatusCode(StatusCodeInterface::STATUS_SEE_OTHER);
-            $response->callExit();
-        }
-
-        if (! $formDisplay->process(false)) {
-            // handle form view and failed POST
-            echo $formDisplay->getDisplay();
-
-            return;
-        }
-
-        // check for form errors
-        if (! $formDisplay->hasErrors()) {
-            $response = ResponseRenderer::getInstance();
-            $response->disable();
-            $response->addHeader('Location', '../setup/index.php' . Url::getCommonRaw(['route' => '/setup']));
-            $response->setStatusCode(StatusCodeInterface::STATUS_SEE_OTHER);
-            $response->callExit();
-        }
-
-        // form has errors, show warning
-        $page = 'index';
-        if (isset($_GET['page']) && in_array($_GET['page'], ['form', 'config', 'servers'], true)) {
-            $page = $_GET['page'];
-        }
-
-        $formset = isset($_GET['formset']) && is_string($_GET['formset']) ? $_GET['formset'] : '';
-        $formId = isset($_GET['id']) && is_numeric($_GET['id']) && (int) $_GET['id'] >= 1 ? (int) $_GET['id'] : 0;
-        if ($formId === 0 && $page === 'servers') {
-            // we've just added a new server, get its id
-            $formId = $formDisplay->getConfigFile()->getServerCount();
-        }
-
-        $urlParams = ['page' => $page, 'formset' => $formset, 'id' => $formId];
-
-        $template = new Template();
-        echo $template->render('setup/error', ['url_params' => $urlParams, 'errors' => $formDisplay->displayErrors()]);
-    }
-}
diff --git a/tests/unit/Setup/FormProcessingTest.php b/tests/unit/Setup/FormProcessingTest.php
deleted file mode 100644
index 2ec5a451e3..0000000000
--- a/tests/unit/Setup/FormProcessingTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace PhpMyAdmin\Tests\Setup;
-
-use PhpMyAdmin\Config;
-use PhpMyAdmin\Config\FormDisplay;
-use PhpMyAdmin\Current;
-use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Exceptions\ExitException;
-use PhpMyAdmin\ResponseRenderer;
-use PhpMyAdmin\Setup\FormProcessing;
-use PhpMyAdmin\Tests\AbstractTestCase;
-use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseRendererStub;
-use PHPUnit\Framework\Attributes\CoversClass;
-use ReflectionProperty;
-use Throwable;
-
-use function ob_get_clean;
-use function ob_start;
-
-#[CoversClass(FormProcessing::class)]
-class FormProcessingTest extends AbstractTestCase
-{
-    /**
-     * Prepares environment for the test.
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->setLanguage();
-
-        Current::$database = 'db';
-        Current::$table = 'table';
-        Config::getInstance()->settings['ServerDefault'] = 1;
-    }
-
-    public function testProcessFormSet(): void
-    {
-        DatabaseInterface::$instance = $this->createDatabaseInterface();
-
-        $responseStub = new ResponseRendererStub();
-        (new ReflectionProperty(ResponseRenderer::class, 'instance'))->setValue(null, $responseStub);
-
-        // case 1
-        $formDisplay = $this->getMockBuilder(FormDisplay::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['process', 'getDisplay'])
-            ->getMock();
-
-        $formDisplay->expects(self::once())
-            ->method('process')
-            ->with(false)
-            ->willReturn(false);
-
-        $formDisplay->expects(self::once())
-            ->method('getDisplay');
-
-        FormProcessing::process($formDisplay);
-
-        // case 2
-        $formDisplay = $this->getMockBuilder(FormDisplay::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['process', 'hasErrors', 'displayErrors'])
-            ->getMock();
-
-        $formDisplay->expects(self::once())
-            ->method('process')
-            ->with(false)
-            ->willReturn(true);
-
-        $formDisplay->expects(self::once())
-            ->method('hasErrors')
-            ->with()
-            ->willReturn(true);
-
-        ob_start();
-        FormProcessing::process($formDisplay);
-        $result = ob_get_clean();
-
-        self::assertIsString($result);
-
-        self::assertStringContainsString('<div class="error">', $result);
-
-        self::assertStringContainsString('mode=revert', $result);
-
-        self::assertStringContainsString('<a class="btn" href="../setup/index.php?route=/setup&', $result);
-
-        self::assertStringContainsString('mode=edit', $result);
-
-        // case 3
-        $formDisplay = $this->getMockBuilder(FormDisplay::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['process', 'hasErrors'])
-            ->getMock();
-
-        $formDisplay->expects(self::once())
-            ->method('process')
-            ->with(false)
-            ->willReturn(true);
-
-        $formDisplay->expects(self::once())
-            ->method('hasErrors')
-            ->with()
-            ->willReturn(false);
-
-        try {
-            FormProcessing::process($formDisplay);
-        } catch (Throwable $throwable) {
-        }
-
-        self::assertInstanceOf(ExitException::class, $throwable ?? null);
-        $response = $responseStub->getResponse();
-        self::assertSame(['../setup/index.php?route=%2Fsetup&lang=en'], $response->getHeader('Location'));
-        self::assertSame(303, $response->getStatusCode());
-    }
-}

From c7963eab22df14866efd6af46126a1d0f8958238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sat, 11 May 2024 17:50:40 -0300
Subject: [PATCH 9/9] Remove ResponseRenderer::disable from
 Setup\ShowConfigController
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 app/services_controllers.php                  |  2 +-
 .../Setup/ShowConfigController.php            | 23 ++++---------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/app/services_controllers.php b/app/services_controllers.php
index 73aa52a4d3..041876e757 100644
--- a/app/services_controllers.php
+++ b/app/services_controllers.php
@@ -873,7 +873,7 @@ return [
         ],
         Setup\ShowConfigController::class => [
             'class' => Setup\ShowConfigController::class,
-            'arguments' => ['@' . ResponseFactory::class, '@response', '@template', '@config'],
+            'arguments' => ['@' . ResponseFactory::class, '@template', '@config'],
         ],
         Setup\ValidateController::class => [
             'class' => Setup\ValidateController::class,
diff --git a/src/Controllers/Setup/ShowConfigController.php b/src/Controllers/Setup/ShowConfigController.php
index c051c41bb7..e1edafc55e 100644
--- a/src/Controllers/Setup/ShowConfigController.php
+++ b/src/Controllers/Setup/ShowConfigController.php
@@ -13,7 +13,6 @@ use PhpMyAdmin\Http\Factory\ResponseFactory;
 use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\LanguageManager;
-use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Setup\ConfigGenerator;
 use PhpMyAdmin\Setup\SetupHelper;
 use PhpMyAdmin\Template;
@@ -29,7 +28,6 @@ final class ShowConfigController implements InvocableController
 {
     public function __construct(
         private readonly ResponseFactory $responseFactory,
-        private readonly ResponseRenderer $responseRenderer,
         private readonly Template $template,
         private readonly Config $config,
     ) {
@@ -52,8 +50,6 @@ final class ShowConfigController implements InvocableController
         $formDisplay = new ConfigForm($configFile);
         $formDisplay->save(['Config']);
 
-        $this->responseRenderer->disable();
-
         /** @var mixed $eol */
         $eol = $request->getParsedBodyParam('eol');
         if ($eol !== null) {
@@ -65,34 +61,25 @@ final class ShowConfigController implements InvocableController
         if (is_string($submitClear) && $submitClear !== '') {
             // Clear current config and return to main page
             $configFile->resetConfigData();
-            // drop post data
-            $this->responseRenderer->addHeader(
-                'Location',
-                '../setup/index.php' . Url::getCommonRaw(['route' => '/setup']),
-            );
-            $this->responseRenderer->setStatusCode(StatusCodeInterface::STATUS_SEE_OTHER);
 
-            return $this->responseRenderer->response();
+            return $this->responseFactory->createResponse(StatusCodeInterface::STATUS_FOUND)
+                ->withHeader('Location', '../setup/index.php' . Url::getCommonRaw(['route' => '/setup']));
         }
 
         /** @var mixed $submitDownload */
         $submitDownload = $request->getParsedBodyParam('submit_download');
         if (is_string($submitDownload) && $submitDownload !== '') {
+            $response = $this->responseFactory->createResponse();
             // Output generated config file
             Core::downloadHeader('config.inc.php', 'text/plain');
-            $this->responseRenderer->disable();
-            echo ConfigGenerator::getConfigFile($configFile);
 
-            return $this->responseRenderer->response();
+            return $response->write(ConfigGenerator::getConfigFile($configFile));
         }
 
         // Show generated config file in a <textarea>
-        $this->responseRenderer->addHeader(
+        return $this->responseFactory->createResponse(StatusCodeInterface::STATUS_FOUND)->withHeader(
             'Location',
             '../setup/index.php' . Url::getCommonRaw(['route' => '/setup', 'page' => 'config']),
         );
-        $this->responseRenderer->setStatusCode(StatusCodeInterface::STATUS_SEE_OTHER);
-
-        return $this->responseRenderer->response();
     }
 }