From 80e39b9b55568cee95d880793bcc8e84b83d0e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Mon, 5 Jul 2021 13:20:43 -0300
Subject: [PATCH] Move ServerRequest creation to common.inc.php
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>
---
 index.php                     | 4 ++--
 libraries/classes/Routing.php | 4 ++--
 libraries/common.inc.php      | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index a8722c5719..730341e73b 100644
--- a/index.php
+++ b/index.php
@@ -10,9 +10,9 @@ if (! defined('ROOT_PATH')) {
     // phpcs:enable
 }
 
-global $route, $containerBuilder;
+global $route, $containerBuilder, $request;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 $dispatcher = Routing::getDispatcher();
-Routing::callControllerForRoute($route, $dispatcher, $containerBuilder);
+Routing::callControllerForRoute($request, $route, $dispatcher, $containerBuilder);
diff --git a/libraries/classes/Routing.php b/libraries/classes/Routing.php
index 84a8795c9c..9b5800fa38 100644
--- a/libraries/classes/Routing.php
+++ b/libraries/classes/Routing.php
@@ -9,7 +9,7 @@ use FastRoute\Dispatcher;
 use FastRoute\Dispatcher\GroupCountBased as DispatcherGroupCountBased;
 use FastRoute\RouteCollector;
 use FastRoute\RouteParser\Std as RouteParserStd;
-use PhpMyAdmin\Http\Factory\ServerRequestFactory;
+use PhpMyAdmin\Http\ServerRequest;
 use Psr\Container\ContainerInterface;
 use RuntimeException;
 
@@ -153,11 +153,11 @@ class Routing
      * Call associated controller for a route using the dispatcher
      */
     public static function callControllerForRoute(
+        ServerRequest $request,
         string $route,
         Dispatcher $dispatcher,
         ContainerInterface $container
     ): void {
-        $request = ServerRequestFactory::createFromGlobals();
         $routeInfo = $dispatcher->dispatch($request->getMethod(), rawurldecode($route));
 
         if ($routeInfo[0] === Dispatcher::NOT_FOUND) {
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index a5b773a43c..ff11f31086 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -34,6 +34,7 @@ use PhpMyAdmin\Config;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\ErrorHandler;
+use PhpMyAdmin\Http\Factory\ServerRequestFactory;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Logging;
 use PhpMyAdmin\Message;
@@ -46,7 +47,7 @@ use PhpMyAdmin\SqlParser\Lexer;
 use PhpMyAdmin\ThemeManager;
 use PhpMyAdmin\Tracker;
 
-global $containerBuilder, $errorHandler, $config, $server, $dbi;
+global $containerBuilder, $errorHandler, $config, $server, $dbi, $request;
 global $lang, $cfg, $isConfigLoading, $auth_plugin, $route, $theme;
 global $urlParams, $goto, $back, $db, $table, $sql_query, $token_mismatch;
 
@@ -107,6 +108,8 @@ if (! defined('K_PATH_IMAGES')) {
     // phpcs:enable
 }
 
+$request = ServerRequestFactory::createFromGlobals();
+
 $route = Routing::getCurrentRoute();
 
 if ($route === '/import-status') {