From dfd5f1307810402ead04bb7f5ba403c80ad2ae82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Thu, 5 Jan 2023 16:27:20 -0300
Subject: [PATCH] Fix some errors detected by Psalm
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>
---
 .../classes/Controllers/Import/ImportController.php      | 9 ++++-----
 libraries/classes/Header.php                             | 3 ++-
 phpstan-baseline.neon                                    | 5 -----
 psalm-baseline.xml                                       | 3 +--
 psalm.xml                                                | 1 +
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/libraries/classes/Controllers/Import/ImportController.php b/libraries/classes/Controllers/Import/ImportController.php
index 9477d28b6f..3f5268c373 100644
--- a/libraries/classes/Controllers/Import/ImportController.php
+++ b/libraries/classes/Controllers/Import/ImportController.php
@@ -301,11 +301,10 @@ final class ImportController extends AbstractController
         }
 
         $timestamp = time();
-        if (isset($_POST['allow_interrupt'])) {
-            $maximum_time = ini_get('max_execution_time');
-            $maximum_time -= 1;// Give 1 second for phpMyAdmin to exit nicely
-        } else {
-            $maximum_time = 0;
+        $maximum_time = 0;
+        $maxExecutionTime = (int) ini_get('max_execution_time');
+        if (isset($_POST['allow_interrupt']) && $maxExecutionTime >= 1) {
+            $maximum_time = $maxExecutionTime - 1; // Give 1 second for phpMyAdmin to exit nicely
         }
 
         // set default values
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
index d25f3d6af8..36717f5ebb 100644
--- a/libraries/classes/Header.php
+++ b/libraries/classes/Header.php
@@ -398,6 +398,7 @@ class Header
 
         $console = $this->console->getDisplay();
         $messages = $this->getMessage();
+        $isLoggedIn = isset($GLOBALS['dbi']) && $GLOBALS['dbi']->isConnected();
 
         return $this->template->render('header', [
             'lang' => $GLOBALS['lang'],
@@ -416,7 +417,7 @@ class Header
             'show_hint' => $GLOBALS['cfg']['ShowHint'],
             'is_warnings_enabled' => $this->warningsEnabled,
             'is_menu_enabled' => $this->menuEnabled,
-            'is_logged_in' => isset($dbi) ? $dbi->isConnected() : false,
+            'is_logged_in' => $isLoggedIn,
             'menu' => $menu ?? '',
             'console' => $console,
             'messages' => $messages,
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 160d028c9a..6484d54093 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -8010,11 +8010,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Sql.php
 
-		-
-			message: "#^Method PhpMyAdmin\\\\Sql\\:\\:getDetailedProfilingStats\\(\\) should return array\\<string, array\\|int\\> but returns array\\<string, array\\<int\\|string, mixed\\>\\|float\\|int\\>\\.$#"
-			count: 1
-			path: libraries/classes/Sql.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Sql\\:\\:getHtmlForPreviousUpdateQuery\\(\\) has parameter \\$sqlData with no value type specified in iterable type array\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index fee09ea3b6..6cbdde0e9e 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -7907,7 +7907,7 @@
       <code>getExtension</code>
       <code>getProperties</code>
     </MixedMethodCall>
-    <MixedOperand occurrences="24">
+    <MixedOperand occurrences="23">
       <code>$charset</code>
       <code>$charset</code>
       <code>$collation</code>
@@ -7916,7 +7916,6 @@
       <code>$display_query</code>
       <code>$executed_queries</code>
       <code>$importPlugin-&gt;getProperties()-&gt;getExtension()</code>
-      <code>$maximum_time</code>
       <code>$msg</code>
       <code>$read_multiply</code>
       <code>$read_multiply</code>
diff --git a/psalm.xml b/psalm.xml
index be42de0e80..c09d3109a2 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -399,6 +399,7 @@
             xml_export_triggers: bool,
             xml_export_views: bool
         }"/>
+        <var name="maximum_time" type="0|positive-int"/>
         <var name="PMA_PHP_SELF" type="string"/>
     </globals>
 </psalm>