From e05c51576cb12b49645e9edda40ab7cc8a0999b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sun, 9 Oct 2022 16:22:51 -0300
Subject: [PATCH 1/2] Extract setup entry points into controllers
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>
---
 .../Controllers/Setup/MainController.php      | 79 +++++++++++++++++++
 .../Setup/ShowConfigController.php            | 50 ++++++++++++
 .../Controllers/Setup/ValidateController.php  | 44 +++++++++++
 psalm-baseline.xml                            | 24 +++---
 setup/config.php                              | 39 +--------
 setup/index.php                               | 68 +---------------
 setup/validate.php                            | 28 +------
 7 files changed, 191 insertions(+), 141 deletions(-)
 create mode 100644 libraries/classes/Controllers/Setup/MainController.php
 create mode 100644 libraries/classes/Controllers/Setup/ShowConfigController.php
 create mode 100644 libraries/classes/Controllers/Setup/ValidateController.php

diff --git a/libraries/classes/Controllers/Setup/MainController.php b/libraries/classes/Controllers/Setup/MainController.php
new file mode 100644
index 0000000000..a4ad7ad459
--- /dev/null
+++ b/libraries/classes/Controllers/Setup/MainController.php
@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Controllers\Setup;
+
+use PhpMyAdmin\Core;
+use PhpMyAdmin\Header;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Url;
+
+use function __;
+use function file_exists;
+use function header;
+use function in_array;
+
+final class MainController
+{
+    public function __invoke(): void
+    {
+        if (@file_exists(CONFIG_FILE) && ! $GLOBALS['cfg']['DBG']['demo']) {
+            Core::fatalError(__('Configuration already exists, setup is disabled!'));
+        }
+
+        $page = 'index';
+        if (isset($_GET['page']) && in_array($_GET['page'], ['form', 'config', 'servers'], true)) {
+            $page = $_GET['page'];
+        }
+
+        Core::noCacheHeader();
+
+        // Sent security-related headers
+        (new Header())->sendHttpHeaders();
+
+        if ($page === 'form') {
+            echo (new FormController($GLOBALS['ConfigFile'], new Template()))([
+                'formset' => $_GET['formset'] ?? null,
+            ]);
+
+            return;
+        }
+
+        if ($page === 'config') {
+            echo (new ConfigController($GLOBALS['ConfigFile'], new Template()))([
+                'formset' => $_GET['formset'] ?? null,
+                'eol' => $_GET['eol'] ?? null,
+            ]);
+
+            return;
+        }
+
+        if ($page === 'servers') {
+            $controller = new ServersController($GLOBALS['ConfigFile'], new Template());
+            if (
+                isset($_GET['mode']) && $_GET['mode'] === 'remove' && ($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'POST'
+            ) {
+                $controller->destroy([
+                    'id' => $_GET['id'] ?? null,
+                ]);
+                header('Location: index.php' . Url::getCommonRaw());
+
+                return;
+            }
+
+            echo $controller->index([
+                'formset' => $_GET['formset'] ?? null,
+                'mode' => $_GET['mode'] ?? null,
+                'id' => $_GET['id'] ?? null,
+            ]);
+
+            return;
+        }
+
+        echo (new HomeController($GLOBALS['ConfigFile'], new Template()))([
+            'formset' => $_GET['formset'] ?? null,
+            'version_check' => $_GET['version_check'] ?? null,
+        ]);
+    }
+}
diff --git a/libraries/classes/Controllers/Setup/ShowConfigController.php b/libraries/classes/Controllers/Setup/ShowConfigController.php
new file mode 100644
index 0000000000..40b73b789e
--- /dev/null
+++ b/libraries/classes/Controllers/Setup/ShowConfigController.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Controllers\Setup;
+
+use PhpMyAdmin\Config\Forms\Setup\ConfigForm;
+use PhpMyAdmin\Core;
+use PhpMyAdmin\ResponseRenderer;
+use PhpMyAdmin\Setup\ConfigGenerator;
+use PhpMyAdmin\Url;
+
+use function is_scalar;
+
+final class ShowConfigController
+{
+    public function __invoke(): void
+    {
+        $form_display = new ConfigForm($GLOBALS['ConfigFile']);
+        $form_display->save('Config');
+
+        $response = ResponseRenderer::getInstance();
+        $response->disable();
+
+        if (isset($_POST['eol'])) {
+            $_SESSION['eol'] = $_POST['eol'] === 'unix' ? 'unix' : 'win';
+        }
+
+        if (isset($_POST['submit_clear']) && is_scalar($_POST['submit_clear']) ? $_POST['submit_clear'] : '') {
+            // Clear current config and return to main page
+            $GLOBALS['ConfigFile']->resetConfigData();
+            // drop post data
+            $response->generateHeader303('index.php' . Url::getCommonRaw());
+
+            return;
+        }
+
+        if (isset($_POST['submit_download']) && is_scalar($_POST['submit_download']) ? $_POST['submit_download'] : '') {
+            // Output generated config file
+            Core::downloadHeader('config.inc.php', 'text/plain');
+            $response->disable();
+            echo ConfigGenerator::getConfigFile($GLOBALS['ConfigFile']);
+
+            return;
+        }
+
+        // Show generated config file in a <textarea>
+        $response->generateHeader303('index.php' . Url::getCommonRaw(['page' => 'config']));
+    }
+}
diff --git a/libraries/classes/Controllers/Setup/ValidateController.php b/libraries/classes/Controllers/Setup/ValidateController.php
new file mode 100644
index 0000000000..426ea09762
--- /dev/null
+++ b/libraries/classes/Controllers/Setup/ValidateController.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Controllers\Setup;
+
+use PhpMyAdmin\Config\Validator;
+use PhpMyAdmin\Core;
+use stdClass;
+
+use function __;
+use function explode;
+use function implode;
+use function is_scalar;
+use function json_decode;
+use function json_encode;
+use function sprintf;
+
+final class ValidateController
+{
+    public function __invoke(): void
+    {
+        Core::headerJSON();
+
+        $ids = isset($_POST['id']) && is_scalar($_POST['id']) ? (string) $_POST['id'] : '';
+        $vids = explode(',', $ids);
+        $vals = isset($_POST['values']) && is_scalar($_POST['values']) ? (string) $_POST['values'] : '';
+        $values = json_decode($vals);
+        if (! ($values instanceof stdClass)) {
+            Core::fatalError(__('Wrong data'));
+        }
+
+        $values = (array) $values;
+        $result = Validator::validate($GLOBALS['ConfigFile'], $vids, $values, true);
+        if ($result === false) {
+            $result = sprintf(
+                __('Wrong data or no validation for %s'),
+                implode(',', $vids)
+            );
+        }
+
+        echo $result !== true ? json_encode($result) : '';
+    }
+}
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 02af90f382..749e5d6e18 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -3143,6 +3143,15 @@
       <code>$id</code>
     </MixedArgumentTypeCoercion>
   </file>
+  <file src="libraries/classes/Controllers/Setup/ValidateController.php">
+    <MixedAssignment occurrences="1">
+      <code>$values</code>
+    </MixedAssignment>
+    <RedundantCast occurrences="2">
+      <code>(string) $_POST['id']</code>
+      <code>(string) $_POST['values']</code>
+    </RedundantCast>
+  </file>
   <file src="libraries/classes/Controllers/Sql/EnumValuesController.php">
     <PossiblyInvalidArgument occurrences="2">
       <code>$column</code>
@@ -14367,8 +14376,7 @@
       <code>mb_strpos($value, '.')</code>
       <code>mb_strrpos($columnSpecification, ')')</code>
     </PossiblyFalseOperand>
-    <PossiblyInvalidArgument occurrences="6">
-      <code>$row</code>
+    <PossiblyInvalidArgument occurrences="5">
       <code>$sep</code>
       <code>$sep</code>
       <code>$table</code>
@@ -14600,15 +14608,6 @@
       <code>(string) $GLOBALS['lang']</code>
     </RedundantCast>
   </file>
-  <file src="setup/validate.php">
-    <MixedAssignment occurrences="1">
-      <code>$values</code>
-    </MixedAssignment>
-    <RedundantCast occurrences="2">
-      <code>(string) $_POST['id']</code>
-      <code>(string) $_POST['values']</code>
-    </RedundantCast>
-  </file>
   <file src="test/classes/AbstractNetworkTestCase.php">
     <MixedAssignment occurrences="1">
       <code>$http_response_code_param</code>
@@ -15537,7 +15536,7 @@
       <code>$_SESSION['tmpval']['relational_display']</code>
       <code>$_SESSION['tmpval']['relational_display']</code>
     </MixedArrayAssignment>
-    <MixedAssignment occurrences="29">
+    <MixedAssignment occurrences="30">
       <code>$actual</code>
       <code>$actual</code>
       <code>$result</code>
@@ -15567,6 +15566,7 @@
       <code>$result</code>
       <code>$result</code>
       <code>$result</code>
+      <code>$result</code>
     </MixedAssignment>
     <MixedInferredReturnType occurrences="1">
       <code>array</code>
diff --git a/setup/config.php b/setup/config.php
index 3eef9a83fe..c48c8c110c 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -1,15 +1,8 @@
 <?php
-/**
- * Front controller for config view / download and clear
- */
 
 declare(strict_types=1);
 
-use PhpMyAdmin\Config\Forms\Setup\ConfigForm;
-use PhpMyAdmin\Core;
-use PhpMyAdmin\ResponseRenderer;
-use PhpMyAdmin\Setup\ConfigGenerator;
-use PhpMyAdmin\Url;
+use PhpMyAdmin\Controllers\Setup\ShowConfigController;
 
 if (! defined('ROOT_PATH')) {
     // phpcs:disable PSR1.Files.SideEffects
@@ -23,32 +16,4 @@ define('PHPMYADMIN', true);
 
 require ROOT_PATH . 'setup/lib/common.inc.php';
 
-$form_display = new ConfigForm($GLOBALS['ConfigFile']);
-$form_display->save('Config');
-
-$response = ResponseRenderer::getInstance();
-$response->disable();
-
-if (isset($_POST['eol'])) {
-    $_SESSION['eol'] = $_POST['eol'] === 'unix' ? 'unix' : 'win';
-}
-
-if (isset($_POST['submit_clear']) && is_scalar($_POST['submit_clear']) ? $_POST['submit_clear'] : '') {
-    // Clear current config and return to main page
-    $GLOBALS['ConfigFile']->resetConfigData();
-    // drop post data
-    $response->generateHeader303('index.php' . Url::getCommonRaw());
-    exit;
-}
-
-if (isset($_POST['submit_download']) && is_scalar($_POST['submit_download']) ? $_POST['submit_download'] : '') {
-    // Output generated config file
-    Core::downloadHeader('config.inc.php', 'text/plain');
-    $response->disable();
-    echo ConfigGenerator::getConfigFile($GLOBALS['ConfigFile']);
-    exit;
-}
-
-// Show generated config file in a <textarea>
-$response->generateHeader303('index.php' . Url::getCommonRaw(['page' => 'config']));
-exit;
+(new ShowConfigController())();
diff --git a/setup/index.php b/setup/index.php
index d3b8f57451..684ed53568 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -1,18 +1,8 @@
 <?php
-/**
- * Front controller for setup script
- */
 
 declare(strict_types=1);
 
-use PhpMyAdmin\Controllers\Setup\ConfigController;
-use PhpMyAdmin\Controllers\Setup\FormController;
-use PhpMyAdmin\Controllers\Setup\HomeController;
-use PhpMyAdmin\Controllers\Setup\ServersController;
-use PhpMyAdmin\Core;
-use PhpMyAdmin\Header;
-use PhpMyAdmin\Template;
-use PhpMyAdmin\Url;
+use PhpMyAdmin\Controllers\Setup\MainController;
 
 if (! defined('ROOT_PATH')) {
     // phpcs:disable PSR1.Files.SideEffects
@@ -26,58 +16,4 @@ define('PHPMYADMIN', true);
 
 require ROOT_PATH . 'setup/lib/common.inc.php';
 
-if (@file_exists(CONFIG_FILE) && ! $GLOBALS['cfg']['DBG']['demo']) {
-    Core::fatalError(__('Configuration already exists, setup is disabled!'));
-}
-
-$page = 'index';
-if (isset($_GET['page']) && in_array($_GET['page'], ['form', 'config', 'servers'], true)) {
-    $page = $_GET['page'];
-}
-
-Core::noCacheHeader();
-
-// Sent security-related headers
-(new Header())->sendHttpHeaders();
-
-if ($page === 'form') {
-    echo (new FormController($GLOBALS['ConfigFile'], new Template()))([
-        'formset' => $_GET['formset'] ?? null,
-    ]);
-
-    return;
-}
-
-if ($page === 'config') {
-    echo (new ConfigController($GLOBALS['ConfigFile'], new Template()))([
-        'formset' => $_GET['formset'] ?? null,
-        'eol' => $_GET['eol'] ?? null,
-    ]);
-
-    return;
-}
-
-if ($page === 'servers') {
-    $controller = new ServersController($GLOBALS['ConfigFile'], new Template());
-    if (isset($_GET['mode']) && $_GET['mode'] === 'remove' && ($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'POST') {
-        $controller->destroy([
-            'id' => $_GET['id'] ?? null,
-        ]);
-        header('Location: index.php' . Url::getCommonRaw());
-
-        return;
-    }
-
-    echo $controller->index([
-        'formset' => $_GET['formset'] ?? null,
-        'mode' => $_GET['mode'] ?? null,
-        'id' => $_GET['id'] ?? null,
-    ]);
-
-    return;
-}
-
-echo (new HomeController($GLOBALS['ConfigFile'], new Template()))([
-    'formset' => $_GET['formset'] ?? null,
-    'version_check' => $_GET['version_check'] ?? null,
-]);
+(new MainController())();
diff --git a/setup/validate.php b/setup/validate.php
index a44a3996a8..736f20e9f5 100644
--- a/setup/validate.php
+++ b/setup/validate.php
@@ -1,12 +1,8 @@
 <?php
-/**
- * Validation callback.
- */
 
 declare(strict_types=1);
 
-use PhpMyAdmin\Config\Validator;
-use PhpMyAdmin\Core;
+use PhpMyAdmin\Controllers\Setup\ValidateController;
 
 if (! defined('ROOT_PATH')) {
     // phpcs:disable PSR1.Files.SideEffects
@@ -20,24 +16,4 @@ define('PHPMYADMIN', true);
 
 require ROOT_PATH . 'setup/lib/common.inc.php';
 
-
-Core::headerJSON();
-
-$ids = isset($_POST['id']) && is_scalar($_POST['id']) ? (string) $_POST['id'] : '';
-$vids = explode(',', $ids);
-$vals = isset($_POST['values']) && is_scalar($_POST['values']) ? (string) $_POST['values'] : '';
-$values = json_decode($vals);
-if (! ($values instanceof stdClass)) {
-    Core::fatalError(__('Wrong data'));
-}
-
-$values = (array) $values;
-$result = Validator::validate($GLOBALS['ConfigFile'], $vids, $values, true);
-if ($result === false) {
-    $result = sprintf(
-        __('Wrong data or no validation for %s'),
-        implode(',', $vids)
-    );
-}
-
-echo $result !== true ? json_encode($result) : '';
+(new ValidateController())();

From 6e3fa576c6d39dc0239eee6b34792b2e2c7bb5d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sun, 9 Oct 2022 17:05:13 -0300
Subject: [PATCH 2/2] Use ServerRequest object for setup controller
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>
---
 .../Controllers/Setup/MainController.php      | 31 ++++++++++---------
 .../Setup/ShowConfigController.php            | 19 ++++++++----
 .../Controllers/Setup/ValidateController.php  | 16 ++++++----
 psalm-baseline.xml                            |  4 ---
 setup/config.php                              |  3 +-
 setup/index.php                               |  3 +-
 setup/validate.php                            |  3 +-
 7 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/libraries/classes/Controllers/Setup/MainController.php b/libraries/classes/Controllers/Setup/MainController.php
index a4ad7ad459..f765f1a7c6 100644
--- a/libraries/classes/Controllers/Setup/MainController.php
+++ b/libraries/classes/Controllers/Setup/MainController.php
@@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Setup;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Header;
+use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Url;
 
@@ -16,15 +17,17 @@ use function in_array;
 
 final class MainController
 {
-    public function __invoke(): void
+    public function __invoke(ServerRequest $request): void
     {
         if (@file_exists(CONFIG_FILE) && ! $GLOBALS['cfg']['DBG']['demo']) {
             Core::fatalError(__('Configuration already exists, setup is disabled!'));
         }
 
+        $params = $request->getQueryParams();
+
         $page = 'index';
-        if (isset($_GET['page']) && in_array($_GET['page'], ['form', 'config', 'servers'], true)) {
-            $page = $_GET['page'];
+        if (isset($params['page']) && in_array($params['page'], ['form', 'config', 'servers'], true)) {
+            $page = $params['page'];
         }
 
         Core::noCacheHeader();
@@ -34,7 +37,7 @@ final class MainController
 
         if ($page === 'form') {
             echo (new FormController($GLOBALS['ConfigFile'], new Template()))([
-                'formset' => $_GET['formset'] ?? null,
+                'formset' => $params['formset'] ?? null,
             ]);
 
             return;
@@ -42,8 +45,8 @@ final class MainController
 
         if ($page === 'config') {
             echo (new ConfigController($GLOBALS['ConfigFile'], new Template()))([
-                'formset' => $_GET['formset'] ?? null,
-                'eol' => $_GET['eol'] ?? null,
+                'formset' => $params['formset'] ?? null,
+                'eol' => $params['eol'] ?? null,
             ]);
 
             return;
@@ -51,11 +54,9 @@ final class MainController
 
         if ($page === 'servers') {
             $controller = new ServersController($GLOBALS['ConfigFile'], new Template());
-            if (
-                isset($_GET['mode']) && $_GET['mode'] === 'remove' && ($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'POST'
-            ) {
+            if (isset($params['mode']) && $params['mode'] === 'remove' && $request->isPost()) {
                 $controller->destroy([
-                    'id' => $_GET['id'] ?? null,
+                    'id' => $params['id'] ?? null,
                 ]);
                 header('Location: index.php' . Url::getCommonRaw());
 
@@ -63,17 +64,17 @@ final class MainController
             }
 
             echo $controller->index([
-                'formset' => $_GET['formset'] ?? null,
-                'mode' => $_GET['mode'] ?? null,
-                'id' => $_GET['id'] ?? null,
+                'formset' => $params['formset'] ?? null,
+                'mode' => $params['mode'] ?? null,
+                'id' => $params['id'] ?? null,
             ]);
 
             return;
         }
 
         echo (new HomeController($GLOBALS['ConfigFile'], new Template()))([
-            'formset' => $_GET['formset'] ?? null,
-            'version_check' => $_GET['version_check'] ?? null,
+            'formset' => $params['formset'] ?? null,
+            'version_check' => $params['version_check'] ?? null,
         ]);
     }
 }
diff --git a/libraries/classes/Controllers/Setup/ShowConfigController.php b/libraries/classes/Controllers/Setup/ShowConfigController.php
index 40b73b789e..9b7d6b5400 100644
--- a/libraries/classes/Controllers/Setup/ShowConfigController.php
+++ b/libraries/classes/Controllers/Setup/ShowConfigController.php
@@ -6,15 +6,16 @@ namespace PhpMyAdmin\Controllers\Setup;
 
 use PhpMyAdmin\Config\Forms\Setup\ConfigForm;
 use PhpMyAdmin\Core;
+use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Setup\ConfigGenerator;
 use PhpMyAdmin\Url;
 
-use function is_scalar;
+use function is_string;
 
 final class ShowConfigController
 {
-    public function __invoke(): void
+    public function __invoke(ServerRequest $request): void
     {
         $form_display = new ConfigForm($GLOBALS['ConfigFile']);
         $form_display->save('Config');
@@ -22,11 +23,15 @@ final class ShowConfigController
         $response = ResponseRenderer::getInstance();
         $response->disable();
 
-        if (isset($_POST['eol'])) {
-            $_SESSION['eol'] = $_POST['eol'] === 'unix' ? 'unix' : 'win';
+        /** @var mixed $eol */
+        $eol = $request->getParsedBodyParam('eol');
+        if ($eol !== null) {
+            $_SESSION['eol'] = $eol === 'unix' ? 'unix' : 'win';
         }
 
-        if (isset($_POST['submit_clear']) && is_scalar($_POST['submit_clear']) ? $_POST['submit_clear'] : '') {
+        /** @var mixed $submitClear */
+        $submitClear = $request->getParsedBodyParam('submit_clear');
+        if (is_string($submitClear) && $submitClear !== '') {
             // Clear current config and return to main page
             $GLOBALS['ConfigFile']->resetConfigData();
             // drop post data
@@ -35,7 +40,9 @@ final class ShowConfigController
             return;
         }
 
-        if (isset($_POST['submit_download']) && is_scalar($_POST['submit_download']) ? $_POST['submit_download'] : '') {
+        /** @var mixed $submitDownload */
+        $submitDownload = $request->getParsedBodyParam('submit_download');
+        if (is_string($submitDownload) && $submitDownload !== '') {
             // Output generated config file
             Core::downloadHeader('config.inc.php', 'text/plain');
             $response->disable();
diff --git a/libraries/classes/Controllers/Setup/ValidateController.php b/libraries/classes/Controllers/Setup/ValidateController.php
index 426ea09762..5ad0685cda 100644
--- a/libraries/classes/Controllers/Setup/ValidateController.php
+++ b/libraries/classes/Controllers/Setup/ValidateController.php
@@ -6,26 +6,30 @@ namespace PhpMyAdmin\Controllers\Setup;
 
 use PhpMyAdmin\Config\Validator;
 use PhpMyAdmin\Core;
+use PhpMyAdmin\Http\ServerRequest;
 use stdClass;
 
 use function __;
 use function explode;
 use function implode;
-use function is_scalar;
+use function is_string;
 use function json_decode;
 use function json_encode;
 use function sprintf;
 
 final class ValidateController
 {
-    public function __invoke(): void
+    public function __invoke(ServerRequest $request): void
     {
         Core::headerJSON();
 
-        $ids = isset($_POST['id']) && is_scalar($_POST['id']) ? (string) $_POST['id'] : '';
-        $vids = explode(',', $ids);
-        $vals = isset($_POST['values']) && is_scalar($_POST['values']) ? (string) $_POST['values'] : '';
-        $values = json_decode($vals);
+        /** @var mixed $id */
+        $id = $request->getParsedBodyParam('id');
+        $vids = explode(',', is_string($id) ? $id : '');
+
+        /** @var mixed $valuesParam */
+        $valuesParam = $request->getParsedBodyParam('values');
+        $values = json_decode(is_string($valuesParam) ? $valuesParam : '');
         if (! ($values instanceof stdClass)) {
             Core::fatalError(__('Wrong data'));
         }
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 749e5d6e18..3afba0f68e 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -3147,10 +3147,6 @@
     <MixedAssignment occurrences="1">
       <code>$values</code>
     </MixedAssignment>
-    <RedundantCast occurrences="2">
-      <code>(string) $_POST['id']</code>
-      <code>(string) $_POST['values']</code>
-    </RedundantCast>
   </file>
   <file src="libraries/classes/Controllers/Sql/EnumValuesController.php">
     <PossiblyInvalidArgument occurrences="2">
diff --git a/setup/config.php b/setup/config.php
index c48c8c110c..4b6956c9e9 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use PhpMyAdmin\Common;
 use PhpMyAdmin\Controllers\Setup\ShowConfigController;
 
 if (! defined('ROOT_PATH')) {
@@ -16,4 +17,4 @@ define('PHPMYADMIN', true);
 
 require ROOT_PATH . 'setup/lib/common.inc.php';
 
-(new ShowConfigController())();
+(new ShowConfigController())(Common::getRequest());
diff --git a/setup/index.php b/setup/index.php
index 684ed53568..fcd80ced5c 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use PhpMyAdmin\Common;
 use PhpMyAdmin\Controllers\Setup\MainController;
 
 if (! defined('ROOT_PATH')) {
@@ -16,4 +17,4 @@ define('PHPMYADMIN', true);
 
 require ROOT_PATH . 'setup/lib/common.inc.php';
 
-(new MainController())();
+(new MainController())(Common::getRequest());
diff --git a/setup/validate.php b/setup/validate.php
index 736f20e9f5..63d2b5b183 100644
--- a/setup/validate.php
+++ b/setup/validate.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use PhpMyAdmin\Common;
 use PhpMyAdmin\Controllers\Setup\ValidateController;
 
 if (! defined('ROOT_PATH')) {
@@ -16,4 +17,4 @@ define('PHPMYADMIN', true);
 
 require ROOT_PATH . 'setup/lib/common.inc.php';
 
-(new ValidateController())();
+(new ValidateController())(Common::getRequest());