Merge branch 'QA_5_2'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Feb 11, 2022 · fb2a94c · fb2a94c
2 parents dd9d322 + d1b99c4
commit fb2a94c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/libraries/classes/ErrorHandler.php b/libraries/classes/ErrorHandler.php
@@ -5,6 +5,7 @@
 namespace PhpMyAdmin;
 
 use ErrorException;
+use Throwable;
 
 use function __;
 use function array_splice;
@@ -14,9 +15,9 @@
 use function headers_sent;
 use function htmlspecialchars;
 use function set_error_handler;
+use function set_exception_handler;
 use function trigger_error;
 
-use Throwable;
 use const E_COMPILE_ERROR;
 use const E_COMPILE_WARNING;
 use const E_CORE_ERROR;
@@ -233,7 +234,7 @@ public function handleError(
      */
     public function handleException(Throwable $exception): void
     {
-        $config = $GLOBALS['PMA_Config'] ?? null;
+        $config = $GLOBALS['config'] ?? null;
         $environment = $config instanceof Config ? $config->get('environment') : 'production';
         if ($environment !== 'development') {
             return;

diff --git a/libraries/classes/Routing.php b/libraries/classes/Routing.php
@@ -19,6 +19,7 @@
 use function htmlspecialchars;
 use function is_array;
 use function is_readable;
+use function is_string;
 use function is_writable;
 use function rawurldecode;
 use function sprintf;
@@ -123,6 +124,7 @@ public static function writeCache(string $cacheContents): bool
      */
     public static function getCurrentRoute(): string
     {
+        /** @var mixed $route */
         $route = $_GET['route'] ?? $_POST['route'] ?? '/';
         if (! is_string($route) || $route === '') {
             $route = '/';
@@ -133,11 +135,10 @@ public static function getCurrentRoute(): string
          *
          * @see https://docs.phpmyadmin.net/en/latest/faq.html#faq1-34
          */
-        if (($route === '/' || $route === '') && isset($_GET['db']) && $_GET['db'] !== '') {
-            $route = '/database/structure';
-            if (isset($_GET['table']) && $_GET['table'] !== '') {
-                $route = '/sql';
-            }
+        $db = isset($_GET['db']) && is_string($_GET['db']) ? $_GET['db'] : '';
+        if ($route === '/' && $db !== '') {
+            $table = isset($_GET['table']) && is_string($_GET['table']) ? $_GET['table'] : '';
+            $route = $table === '' ? '/database/structure' : '/sql';
         }
 
         return $route;