Drop $GLOBALS['error_message']

kamil-tekiela · MauricioFauth · commit 747ac5f7a732 · 2024-11-13T15:40:22.000-03:00
Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -7399,11 +7399,6 @@ parameters:
 			count: 1
 			path: src/Http/Middleware/StatementHistory.php
 
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Http/Middleware/StatementHistory.php
-
 		-
 			message: "#^Parameter \\#4 \\$sqlquery of method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:setHistory\\(\\) expects string, mixed given\\.$#"
 			count: 1
@@ -11641,7 +11636,7 @@ parameters:
 
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 4
+			count: 3
 			path: src/ResponseRenderer.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -6105,9 +6105,6 @@
     <MixedArgument>
       <code><![CDATA[$GLOBALS['sql_query']]]></code>
     </MixedArgument>
-    <RiskyTruthyFalsyComparison>
-      <code><![CDATA[empty($GLOBALS['error_message'])]]></code>
-    </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Http/Middleware/TokenRequestParamChecking.php">
     <MixedArgument>
@@ -9630,7 +9627,6 @@
       <code><![CDATA[$value]]></code>
     </MixedAssignment>
     <RiskyTruthyFalsyComparison>
-      <code><![CDATA[empty($GLOBALS['error_message'])]]></code>
       <code><![CDATA[empty($_REQUEST['no_debug'])]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
diff --git a/psalm.xml b/psalm.xml
@@ -57,7 +57,6 @@
             display_query: string,
             errno: int,
             error: bool,
-            error_message: string,
             excel_edition: 'win'|'mac_excel2003'|'mac_excel2008',
             file_handle: resource|null,
             finished: bool,
diff --git a/src/Http/Middleware/StatementHistory.php b/src/Http/Middleware/StatementHistory.php
@@ -37,7 +37,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
         if (
             ! $request->has('no_history')
-            && empty($GLOBALS['error_message'])
             && $GLOBALS['sql_query'] !== ''
             && $this->dbi->isConnected()
         ) {
diff --git a/src/ResponseRenderer.php b/src/ResponseRenderer.php
@@ -293,29 +293,27 @@ private function ajaxResponse(): string
             $promptPhpErrors = $this->errorHandler->hasErrorsForPrompt();
             $this->addJSON('promptPhpErrors', $promptPhpErrors);
 
-            if (empty($GLOBALS['error_message'])) {
-                // set current db, table and sql query in the querywindow
-                // (this is for the bottom console)
-                $query = '';
-                $maxChars = $this->config->settings['MaxCharactersInDisplayedSQL'];
-                if (isset($GLOBALS['sql_query']) && mb_strlen($GLOBALS['sql_query']) < $maxChars) {
-                    $query = $GLOBALS['sql_query'];
-                }
-
-                $this->addJSON(
-                    'reloadQuerywindow',
-                    ['db' => Current::$database, 'table' => Current::$table, 'sql_query' => $query],
-                );
-                if (! empty($GLOBALS['focus_querywindow'])) {
-                    $this->addJSON('_focusQuerywindow', $query);
-                }
-
-                if (! empty($GLOBALS['reload'])) {
-                    $this->addJSON('reloadNavigation', 1);
-                }
-
-                $this->addJSON('params', $this->getHeader()->getJsParams());
+            // set current db, table and sql query in the querywindow
+            // (this is for the bottom console)
+            $query = '';
+            $maxChars = $this->config->settings['MaxCharactersInDisplayedSQL'];
+            if (isset($GLOBALS['sql_query']) && mb_strlen($GLOBALS['sql_query']) < $maxChars) {
+                $query = $GLOBALS['sql_query'];
             }
+
+            $this->addJSON(
+                'reloadQuerywindow',
+                ['db' => Current::$database, 'table' => Current::$table, 'sql_query' => $query],
+            );
+            if (! empty($GLOBALS['focus_querywindow'])) {
+                $this->addJSON('_focusQuerywindow', $query);
+            }
+
+            if (! empty($GLOBALS['reload'])) {
+                $this->addJSON('reloadNavigation', 1);
+            }
+
+            $this->addJSON('params', $this->getHeader()->getJsParams());
         }
 
         $result = json_encode($this->JSON);
diff --git a/tests/unit/FooterTest.php b/tests/unit/FooterTest.php
@@ -46,7 +46,6 @@ protected function setUp(): void
         $_GET['reload_left_frame'] = '1';
         $GLOBALS['focus_querywindow'] = 'main_pane_left';
         $this->object = new Footer(new Template(), $config);
-        unset($GLOBALS['error_message']);
         unset($GLOBALS['sql_query']);
         $_POST = [];
     }

Original file line number	Diff line number	Diff line change
`@@ -7399,11 +7399,6 @@ parameters:`
`7399`	`7399`	`count: 1`
`7400`	`7400`	`path: src/Http/Middleware/StatementHistory.php`
`7401`	`7401`
`7402`		`- -`
`7403`		`- message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"`
`7404`		`- count: 1`
`7405`		`- path: src/Http/Middleware/StatementHistory.php`
`7406`		`-`
`7407`	`7402`	`-`
`7408`	`7403`	`message: "#^Parameter \\#4 \\$sqlquery of method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:setHistory\\(\\) expects string, mixed given\\.$#"`
`7409`	`7404`	`count: 1`
`@@ -11641,7 +11636,7 @@ parameters:`
`11641`	`11636`
`11642`	`11637`	`-`
`11643`	`11638`	`message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"`
`11644`		`- count: 4`
	`11639`	`+ count: 3`
`11645`	`11640`	`path: src/ResponseRenderer.php`
`11646`	`11641`
`11647`	`11642`	`-`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ protected function setUp(): void`
`46`	`46`	`$_GET['reload_left_frame'] = '1';`
`47`	`47`	`$GLOBALS['focus_querywindow'] = 'main_pane_left';`
`48`	`48`	`$this->object = new Footer(new Template(), $config);`
`49`		`- unset($GLOBALS['error_message']);`
`50`	`49`	`unset($GLOBALS['sql_query']);`
`51`	`50`	`$_POST = [];`
`52`	`51`	`}`