Merge pull request phpmyadmin#19438 from MauricioFauth/sql_query-glob…

…al-replacing Replace sql_query global var with Current::$sqlQuery
liviuconcioiu · Dec 9, 2024 · c29067d · c29067d
2 parents 40c5a13 + 7d6b17a
commit c29067d
Show file tree

Hide file tree

Showing 59 changed files with 269 additions and 608 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1257,9 +1257,6 @@
     <PossiblyUnusedMethod>
       <code><![CDATA[__construct]]></code>
     </PossiblyUnusedMethod>
-    <RiskyTruthyFalsyComparison>
-      <code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
-    </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Controllers/Database/Structure/EmptyFormController.php">
     <PossiblyUnusedMethod>
@@ -1502,9 +1499,6 @@
       <code><![CDATA[$GLOBALS['export_type']]]></code>
       <code><![CDATA[$GLOBALS['file_handle']]]></code>
       <code><![CDATA[$GLOBALS['save_filename']]]></code>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
       <code><![CDATA[$dbSelect]]></code>
     </MixedArgument>
     <MixedArgumentTypeCoercion>
@@ -1646,9 +1640,6 @@
       <code><![CDATA[$GLOBALS['export_type']]]></code>
       <code><![CDATA[$GLOBALS['file_handle']]]></code>
       <code><![CDATA[$GLOBALS['save_filename']]]></code>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
       <code><![CDATA[$this->export->dumpBuffer]]></code>
       <code><![CDATA[$this->export->dumpBuffer]]></code>
     </PossiblyInvalidArgument>
@@ -1668,9 +1659,6 @@
       <code><![CDATA[$GLOBALS['export_type']]]></code>
       <code><![CDATA[$GLOBALS['export_type']]]></code>
       <code><![CDATA[$GLOBALS['save_filename']]]></code>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
       <code><![CDATA[$this->export->dumpBuffer]]></code>
       <code><![CDATA[$this->export->dumpBuffer]]></code>
     </PossiblyInvalidCast>
@@ -1848,7 +1836,6 @@
       <code><![CDATA[$request->getParsedBodyParamAsString('import_type', '')]]></code>
     </PropertyTypeCoercion>
     <RiskyTruthyFalsyComparison>
-      <code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
       <code><![CDATA[empty($config->settings['MemoryLimit'])]]></code>
     </RiskyTruthyFalsyComparison>
     <UnusedProperty>
@@ -2079,9 +2066,6 @@
     </PossiblyUnusedReturnValue>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[empty($GLOBALS['message_to_show'])]]></code>
-      <code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
-      <code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
-      <code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
       <code><![CDATA[empty($createOptions['checksum'])]]></code>
       <code><![CDATA[empty($createOptions['checksum'])]]></code>
       <code><![CDATA[empty($createOptions['delay_key_write'])]]></code>
@@ -2781,10 +2765,7 @@
       <code><![CDATA[$GLOBALS['disp_message'] ?? null]]></code>
       <code><![CDATA[$GLOBALS['errorUrl']]]></code>
       <code><![CDATA[$GLOBALS['message_to_show'] ?? null]]></code>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
       <code><![CDATA[$request->getQueryParam('sql_signature')]]></code>
-      <code><![CDATA[$sqlQuery]]></code>
       <code><![CDATA[Current::$table]]></code>
     </MixedArgument>
     <MixedArrayAccess>
@@ -2796,12 +2777,13 @@
       <code><![CDATA[$GLOBALS['disp_query']]]></code>
       <code><![CDATA[$GLOBALS['errorUrl']]]></code>
       <code><![CDATA[$GLOBALS['message_to_show']]]></code>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
       <code><![CDATA[$GLOBALS['unlim_num_rows']]]></code>
       <code><![CDATA[$bkmAllUsers]]></code>
       <code><![CDATA[$sqlQuery]]></code>
-      <code><![CDATA[$sqlQuery]]></code>
     </MixedAssignment>
+    <PossiblyNullArgument>
+      <code><![CDATA[$GLOBALS['errorUrl']]]></code>
+    </PossiblyNullArgument>
   </file>
   <file src="src/Controllers/Table/AddFieldController.php">
     <InvalidArrayOffset>
@@ -2908,6 +2890,9 @@
       <code><![CDATA[$GLOBALS['errorUrl']]]></code>
       <code><![CDATA[$GLOBALS['errorUrl']]]></code>
     </InvalidArrayOffset>
+    <MixedArgument>
+      <code><![CDATA[Current::$sqlQuery]]></code>
+    </MixedArgument>
     <MixedArgumentTypeCoercion>
       <code><![CDATA[UrlParams::$params]]></code>
     </MixedArgumentTypeCoercion>
@@ -3071,7 +3056,6 @@
       <code><![CDATA[$parser->list]]></code>
     </PossiblyNullArgument>
     <RiskyTruthyFalsyComparison>
-      <code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
       <code><![CDATA[empty($GLOBALS['where_clause'])]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
@@ -3447,7 +3431,6 @@
     </PossiblyUnusedReturnValue>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[empty($GLOBALS['query'])]]></code>
-      <code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
       <code><![CDATA[empty($mimeMap[$columnName]['input_transformation'])]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
@@ -3934,7 +3917,6 @@
       <code><![CDATA[$view['name']]]></code>
     </MixedArgument>
     <MixedAssignment>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
       <code><![CDATA[$db]]></code>
       <code><![CDATA[$table]]></code>
     </MixedAssignment>
@@ -6031,7 +6013,6 @@
     </PossiblyUndefinedArrayOffset>
     <RedundantCast>
       <code><![CDATA[(string) $GLOBALS['display_query']]]></code>
-      <code><![CDATA[(string) $GLOBALS['sql_query']]]></code>
     </RedundantCast>
     <RiskyCast>
       <code><![CDATA[$_REQUEST['pos']]]></code>
@@ -6044,8 +6025,6 @@
       <code><![CDATA[empty($GLOBALS['show_as_php'])]]></code>
       <code><![CDATA[empty($GLOBALS['show_as_php'])]]></code>
       <code><![CDATA[empty($GLOBALS['show_as_php'])]]></code>
-      <code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
-      <code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
       <code><![CDATA[empty($server['socket'])]]></code>
       <code><![CDATA[empty($server['ssl_ca'])]]></code>
     </RiskyTruthyFalsyComparison>
@@ -6076,7 +6055,7 @@
       <code><![CDATA[DatabaseInterface::getInstance()]]></code>
     </DeprecatedMethod>
     <MixedArgument>
-      <code><![CDATA[$GLOBALS['sql_query']]]></code>
+      <code><![CDATA[Current::$sqlQuery]]></code>
     </MixedArgument>
   </file>
   <file src="src/Http/Middleware/TokenRequestParamChecking.php">
@@ -6187,7 +6166,6 @@
     </RedundantCondition>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[ImportSettings::$runQuery]]></code>
-      <code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Index.php">

diff --git a/psalm.xml b/psalm.xml
@@ -102,7 +102,6 @@
             sql_ignore: bool,
             sql_insert_syntax: 'complete'|'extended'|'both'|'none',
             sql_max_query_size: 0|positive-int,
-            sql_query: string,
             sql_structure_or_data: 'structure'|'data'|'structure_and_data',
             sql_type: 'INSERT'|'UPDATE'|'REPLACE',
             tbl_storage_engine: string,

diff --git a/src/Controllers/Database/ExportController.php b/src/Controllers/Database/ExportController.php
@@ -126,10 +126,6 @@ public function __invoke(ServerRequest $request): Response
             ];
         }
 
-        if (! isset($GLOBALS['sql_query'])) {
-            $GLOBALS['sql_query'] = '';
-        }
-
         if (! isset($GLOBALS['unlim_num_rows'])) {
             $GLOBALS['unlim_num_rows'] = 0;
         }
@@ -157,7 +153,7 @@ public function __invoke(ServerRequest $request): Response
             $exportType,
             Current::$database,
             Current::$table,
-            $GLOBALS['sql_query'],
+            Current::$sqlQuery,
             $GLOBALS['num_tables'],
             $GLOBALS['unlim_num_rows'],
             $exportList,

diff --git a/src/Controllers/Database/Structure/AddPrefixTableController.php b/src/Controllers/Database/Structure/AddPrefixTableController.php
@@ -26,15 +26,15 @@ public function __invoke(ServerRequest $request): Response
         /** @var string[] $selected */
         $selected = $request->getParsedBodyParam('selected', []);
 
-        $GLOBALS['sql_query'] = '';
+        Current::$sqlQuery = '';
 
         $this->dbi->selectDb(Current::$database);
 
         foreach ($selected as $selectedValue) {
             $newTableName = $request->getParsedBodyParamAsString('add_prefix', '') . $selectedValue;
             $aQuery = 'ALTER TABLE ' . Util::backquote($selectedValue) . ' RENAME ' . Util::backquote($newTableName);
 
-            $GLOBALS['sql_query'] .= $aQuery . ';' . "\n";
+            Current::$sqlQuery .= $aQuery . ';' . "\n";
             $this->dbi->query($aQuery);
         }
 

diff --git a/src/Controllers/Database/Structure/DropTableController.php b/src/Controllers/Database/Structure/DropTableController.php
@@ -42,7 +42,7 @@ public function __invoke(ServerRequest $request): Response
         }
 
         $defaultFkCheckValue = ForeignKey::handleDisableCheckInit();
-        $GLOBALS['sql_query'] = '';
+        Current::$sqlQuery = '';
         $sqlQueryViews = '';
 
         foreach ($selected as $selectedValue) {
@@ -51,17 +51,17 @@ public function __invoke(ServerRequest $request): Response
             if ($this->dbi->getTable(Current::$database, $selectedValue)->isView()) {
                 $sqlQueryViews .= ($sqlQueryViews === '' ? 'DROP VIEW ' : ', ') . Util::backquote($selectedValue);
             } else {
-                $GLOBALS['sql_query'] .= (empty($GLOBALS['sql_query']) ? 'DROP TABLE ' : ', ')
+                Current::$sqlQuery .= (Current::$sqlQuery === '' ? 'DROP TABLE ' : ', ')
                     . Util::backquote($selectedValue);
             }
 
             $GLOBALS['reload'] = 1;
         }
 
-        if (! empty($GLOBALS['sql_query'])) {
-            $GLOBALS['sql_query'] .= ';';
+        if (Current::$sqlQuery !== '') {
+            Current::$sqlQuery .= ';';
         } elseif ($sqlQueryViews !== '') {
-            $GLOBALS['sql_query'] = $sqlQueryViews . ';';
+            Current::$sqlQuery = $sqlQueryViews . ';';
             $sqlQueryViews = '';
         }
 
@@ -79,14 +79,14 @@ public function __invoke(ServerRequest $request): Response
         $GLOBALS['message'] = Message::success();
 
         $this->dbi->selectDb(Current::$database);
-        $result = $this->dbi->tryQuery($GLOBALS['sql_query']);
+        $result = $this->dbi->tryQuery(Current::$sqlQuery);
 
         if (! $result) {
             $GLOBALS['message'] = Message::error($this->dbi->getError());
         }
 
         if ($result && $sqlQueryViews !== '') {
-            $GLOBALS['sql_query'] .= ' ' . $sqlQueryViews . ';';
+            Current::$sqlQuery .= ' ' . $sqlQueryViews . ';';
             $result = $this->dbi->tryQuery($sqlQueryViews);
             unset($sqlQueryViews);
         }

diff --git a/src/Controllers/Database/Structure/EmptyTableController.php b/src/Controllers/Database/Structure/EmptyTableController.php
@@ -54,7 +54,7 @@ public function __invoke(ServerRequest $request): Response
 
         $defaultFkCheckValue = ForeignKey::handleDisableCheckInit();
 
-        $GLOBALS['sql_query'] = '';
+        Current::$sqlQuery = '';
 
         $this->dbi->selectDb(Current::$database);
 
@@ -66,7 +66,7 @@ public function __invoke(ServerRequest $request): Response
             $aQuery = 'TRUNCATE ';
             $aQuery .= Util::backquote($selectedValue);
 
-            $GLOBALS['sql_query'] .= $aQuery . ';' . "\n";
+            Current::$sqlQuery .= $aQuery . ';' . "\n";
             $this->dbi->query($aQuery);
         }
 

diff --git a/src/Controllers/Database/Structure/ReplacePrefixController.php b/src/Controllers/Database/Structure/ReplacePrefixController.php
@@ -35,7 +35,7 @@ public function __invoke(ServerRequest $request): Response
         $fromPrefix = $request->getParsedBodyParamAsString('from_prefix', '');
         $toPrefix = $request->getParsedBodyParamAsString('to_prefix', '');
 
-        $GLOBALS['sql_query'] = '';
+        Current::$sqlQuery = '';
 
         $this->dbi->selectDb(Current::$database);
 
@@ -51,13 +51,13 @@ public function __invoke(ServerRequest $request): Response
             $aQuery = 'ALTER TABLE ' . Util::backquote($selectedValue)
                 . ' RENAME ' . Util::backquote($newTableName);
 
-            $GLOBALS['sql_query'] .= $aQuery . ';' . "\n";
+            Current::$sqlQuery .= $aQuery . ';' . "\n";
             $this->dbi->query($aQuery);
         }
 
         $GLOBALS['message'] = Message::success();
 
-        $this->flashMessenger->addMessage('success', $GLOBALS['message']->getMessage(), $GLOBALS['sql_query']);
+        $this->flashMessenger->addMessage('success', $GLOBALS['message']->getMessage(), Current::$sqlQuery);
 
         return $this->responseFactory->createResponse(StatusCodeInterface::STATUS_FOUND)
             ->withHeader('Location', Url::getFromRoute('/database/structure', ['db' => Current::$database]));

diff --git a/src/Controllers/Export/ExportController.php b/src/Controllers/Export/ExportController.php
@@ -178,7 +178,7 @@ public function __invoke(ServerRequest $request): Response
                 'table' => Current::$table,
             ]);
         } elseif ($GLOBALS['export_type'] === 'raw') {
-            $GLOBALS['errorUrl'] = Url::getFromRoute('/server/export', ['sql_query' => $GLOBALS['sql_query']]);
+            $GLOBALS['errorUrl'] = Url::getFromRoute('/server/export', ['sql_query' => Current::$sqlQuery]);
         } else {
             $this->response->setRequestStatus(false);
             $this->response->addHTML(Message::error(__('Bad parameters!'))->getDisplay());
@@ -189,7 +189,7 @@ public function __invoke(ServerRequest $request): Response
         // Merge SQL Query aliases with Export aliases from
         // export page, Export page aliases are given more
         // preference over SQL Query aliases.
-        $parser = new Parser($GLOBALS['sql_query']);
+        $parser = new Parser(Current::$sqlQuery);
         $aliases = [];
         if (! empty($parser->statements[0]) && $parser->statements[0] instanceof SelectStatement) {
             $aliases = $parser->statements[0]->getAliases(Current::$database);
@@ -426,7 +426,7 @@ public function __invoke(ServerRequest $request): Response
                     $exportPlugin,
                     $GLOBALS['errorUrl'],
                     Current::$database,
-                    $GLOBALS['sql_query'],
+                    Current::$sqlQuery,
                 );
             } else {
                 // We export just one table
@@ -452,7 +452,7 @@ public function __invoke(ServerRequest $request): Response
                             $allrows,
                             $limitTo,
                             $limitFrom,
-                            $GLOBALS['sql_query'],
+                            Current::$sqlQuery,
                             $aliases,
                         );
                     } finally {
@@ -473,7 +473,7 @@ public function __invoke(ServerRequest $request): Response
                         $allrows,
                         $limitTo,
                         $limitFrom,
-                        $GLOBALS['sql_query'],
+                        Current::$sqlQuery,
                         $aliases,
                     );
                 }