Skip to content

Commit c29067d

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19438 from MauricioFauth/sql_query-global-replacing
Replace sql_query global var with Current::$sqlQuery
2 parents 40c5a13 + 7d6b17a commit c29067d

59 files changed

Lines changed: 269 additions & 608 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎phpstan-baseline.neon‎

Lines changed: 16 additions & 328 deletions
Large diffs are not rendered by default.

‎psalm-baseline.xml‎

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,9 +1257,6 @@
12571257
<PossiblyUnusedMethod>
12581258
<code><![CDATA[__construct]]></code>
12591259
</PossiblyUnusedMethod>
1260-
<RiskyTruthyFalsyComparison>
1261-
<code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
1262-
</RiskyTruthyFalsyComparison>
12631260
</file>
12641261
<file src="src/Controllers/Database/Structure/EmptyFormController.php">
12651262
<PossiblyUnusedMethod>
@@ -1502,9 +1499,6 @@
15021499
<code><![CDATA[$GLOBALS['export_type']]]></code>
15031500
<code><![CDATA[$GLOBALS['file_handle']]]></code>
15041501
<code><![CDATA[$GLOBALS['save_filename']]]></code>
1505-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
1506-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
1507-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
15081502
<code><![CDATA[$dbSelect]]></code>
15091503
</MixedArgument>
15101504
<MixedArgumentTypeCoercion>
@@ -1646,9 +1640,6 @@
16461640
<code><![CDATA[$GLOBALS['export_type']]]></code>
16471641
<code><![CDATA[$GLOBALS['file_handle']]]></code>
16481642
<code><![CDATA[$GLOBALS['save_filename']]]></code>
1649-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
1650-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
1651-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
16521643
<code><![CDATA[$this->export->dumpBuffer]]></code>
16531644
<code><![CDATA[$this->export->dumpBuffer]]></code>
16541645
</PossiblyInvalidArgument>
@@ -1668,9 +1659,6 @@
16681659
<code><![CDATA[$GLOBALS['export_type']]]></code>
16691660
<code><![CDATA[$GLOBALS['export_type']]]></code>
16701661
<code><![CDATA[$GLOBALS['save_filename']]]></code>
1671-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
1672-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
1673-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
16741662
<code><![CDATA[$this->export->dumpBuffer]]></code>
16751663
<code><![CDATA[$this->export->dumpBuffer]]></code>
16761664
</PossiblyInvalidCast>
@@ -1848,7 +1836,6 @@
18481836
<code><![CDATA[$request->getParsedBodyParamAsString('import_type', '')]]></code>
18491837
</PropertyTypeCoercion>
18501838
<RiskyTruthyFalsyComparison>
1851-
<code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
18521839
<code><![CDATA[empty($config->settings['MemoryLimit'])]]></code>
18531840
</RiskyTruthyFalsyComparison>
18541841
<UnusedProperty>
@@ -2079,9 +2066,6 @@
20792066
</PossiblyUnusedReturnValue>
20802067
<RiskyTruthyFalsyComparison>
20812068
<code><![CDATA[empty($GLOBALS['message_to_show'])]]></code>
2082-
<code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
2083-
<code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
2084-
<code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
20852069
<code><![CDATA[empty($createOptions['checksum'])]]></code>
20862070
<code><![CDATA[empty($createOptions['checksum'])]]></code>
20872071
<code><![CDATA[empty($createOptions['delay_key_write'])]]></code>
@@ -2781,10 +2765,7 @@
27812765
<code><![CDATA[$GLOBALS['disp_message'] ?? null]]></code>
27822766
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
27832767
<code><![CDATA[$GLOBALS['message_to_show'] ?? null]]></code>
2784-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
2785-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
27862768
<code><![CDATA[$request->getQueryParam('sql_signature')]]></code>
2787-
<code><![CDATA[$sqlQuery]]></code>
27882769
<code><![CDATA[Current::$table]]></code>
27892770
</MixedArgument>
27902771
<MixedArrayAccess>
@@ -2796,12 +2777,13 @@
27962777
<code><![CDATA[$GLOBALS['disp_query']]]></code>
27972778
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
27982779
<code><![CDATA[$GLOBALS['message_to_show']]]></code>
2799-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
28002780
<code><![CDATA[$GLOBALS['unlim_num_rows']]]></code>
28012781
<code><![CDATA[$bkmAllUsers]]></code>
28022782
<code><![CDATA[$sqlQuery]]></code>
2803-
<code><![CDATA[$sqlQuery]]></code>
28042783
</MixedAssignment>
2784+
<PossiblyNullArgument>
2785+
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
2786+
</PossiblyNullArgument>
28052787
</file>
28062788
<file src="src/Controllers/Table/AddFieldController.php">
28072789
<InvalidArrayOffset>
@@ -2908,6 +2890,9 @@
29082890
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
29092891
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
29102892
</InvalidArrayOffset>
2893+
<MixedArgument>
2894+
<code><![CDATA[Current::$sqlQuery]]></code>
2895+
</MixedArgument>
29112896
<MixedArgumentTypeCoercion>
29122897
<code><![CDATA[UrlParams::$params]]></code>
29132898
</MixedArgumentTypeCoercion>
@@ -3071,7 +3056,6 @@
30713056
<code><![CDATA[$parser->list]]></code>
30723057
</PossiblyNullArgument>
30733058
<RiskyTruthyFalsyComparison>
3074-
<code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
30753059
<code><![CDATA[empty($GLOBALS['where_clause'])]]></code>
30763060
</RiskyTruthyFalsyComparison>
30773061
</file>
@@ -3447,7 +3431,6 @@
34473431
</PossiblyUnusedReturnValue>
34483432
<RiskyTruthyFalsyComparison>
34493433
<code><![CDATA[empty($GLOBALS['query'])]]></code>
3450-
<code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
34513434
<code><![CDATA[empty($mimeMap[$columnName]['input_transformation'])]]></code>
34523435
</RiskyTruthyFalsyComparison>
34533436
</file>
@@ -3934,7 +3917,6 @@
39343917
<code><![CDATA[$view['name']]]></code>
39353918
</MixedArgument>
39363919
<MixedAssignment>
3937-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
39383920
<code><![CDATA[$db]]></code>
39393921
<code><![CDATA[$table]]></code>
39403922
</MixedAssignment>
@@ -6031,7 +6013,6 @@
60316013
</PossiblyUndefinedArrayOffset>
60326014
<RedundantCast>
60336015
<code><![CDATA[(string) $GLOBALS['display_query']]]></code>
6034-
<code><![CDATA[(string) $GLOBALS['sql_query']]]></code>
60356016
</RedundantCast>
60366017
<RiskyCast>
60376018
<code><![CDATA[$_REQUEST['pos']]]></code>
@@ -6044,8 +6025,6 @@
60446025
<code><![CDATA[empty($GLOBALS['show_as_php'])]]></code>
60456026
<code><![CDATA[empty($GLOBALS['show_as_php'])]]></code>
60466027
<code><![CDATA[empty($GLOBALS['show_as_php'])]]></code>
6047-
<code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
6048-
<code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
60496028
<code><![CDATA[empty($server['socket'])]]></code>
60506029
<code><![CDATA[empty($server['ssl_ca'])]]></code>
60516030
</RiskyTruthyFalsyComparison>
@@ -6076,7 +6055,7 @@
60766055
<code><![CDATA[DatabaseInterface::getInstance()]]></code>
60776056
</DeprecatedMethod>
60786057
<MixedArgument>
6079-
<code><![CDATA[$GLOBALS['sql_query']]]></code>
6058+
<code><![CDATA[Current::$sqlQuery]]></code>
60806059
</MixedArgument>
60816060
</file>
60826061
<file src="src/Http/Middleware/TokenRequestParamChecking.php">
@@ -6187,7 +6166,6 @@
61876166
</RedundantCondition>
61886167
<RiskyTruthyFalsyComparison>
61896168
<code><![CDATA[ImportSettings::$runQuery]]></code>
6190-
<code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
61916169
</RiskyTruthyFalsyComparison>
61926170
</file>
61936171
<file src="src/Index.php">

‎psalm.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
sql_ignore: bool,
103103
sql_insert_syntax: 'complete'|'extended'|'both'|'none',
104104
sql_max_query_size: 0|positive-int,
105-
sql_query: string,
106105
sql_structure_or_data: 'structure'|'data'|'structure_and_data',
107106
sql_type: 'INSERT'|'UPDATE'|'REPLACE',
108107
tbl_storage_engine: string,

‎src/Controllers/Database/ExportController.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,6 @@ public function __invoke(ServerRequest $request): Response
126126
];
127127
}
128128

129-
if (! isset($GLOBALS['sql_query'])) {
130-
$GLOBALS['sql_query'] = '';
131-
}
132-
133129
if (! isset($GLOBALS['unlim_num_rows'])) {
134130
$GLOBALS['unlim_num_rows'] = 0;
135131
}
@@ -157,7 +153,7 @@ public function __invoke(ServerRequest $request): Response
157153
$exportType,
158154
Current::$database,
159155
Current::$table,
160-
$GLOBALS['sql_query'],
156+
Current::$sqlQuery,
161157
$GLOBALS['num_tables'],
162158
$GLOBALS['unlim_num_rows'],
163159
$exportList,

‎src/Controllers/Database/Structure/AddPrefixTableController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ public function __invoke(ServerRequest $request): Response
2626
/** @var string[] $selected */
2727
$selected = $request->getParsedBodyParam('selected', []);
2828

29-
$GLOBALS['sql_query'] = '';
29+
Current::$sqlQuery = '';
3030

3131
$this->dbi->selectDb(Current::$database);
3232

3333
foreach ($selected as $selectedValue) {
3434
$newTableName = $request->getParsedBodyParamAsString('add_prefix', '') . $selectedValue;
3535
$aQuery = 'ALTER TABLE ' . Util::backquote($selectedValue) . ' RENAME ' . Util::backquote($newTableName);
3636

37-
$GLOBALS['sql_query'] .= $aQuery . ';' . "\n";
37+
Current::$sqlQuery .= $aQuery . ';' . "\n";
3838
$this->dbi->query($aQuery);
3939
}
4040

‎src/Controllers/Database/Structure/DropTableController.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function __invoke(ServerRequest $request): Response
4242
}
4343

4444
$defaultFkCheckValue = ForeignKey::handleDisableCheckInit();
45-
$GLOBALS['sql_query'] = '';
45+
Current::$sqlQuery = '';
4646
$sqlQueryViews = '';
4747

4848
foreach ($selected as $selectedValue) {
@@ -51,17 +51,17 @@ public function __invoke(ServerRequest $request): Response
5151
if ($this->dbi->getTable(Current::$database, $selectedValue)->isView()) {
5252
$sqlQueryViews .= ($sqlQueryViews === '' ? 'DROP VIEW ' : ', ') . Util::backquote($selectedValue);
5353
} else {
54-
$GLOBALS['sql_query'] .= (empty($GLOBALS['sql_query']) ? 'DROP TABLE ' : ', ')
54+
Current::$sqlQuery .= (Current::$sqlQuery === '' ? 'DROP TABLE ' : ', ')
5555
. Util::backquote($selectedValue);
5656
}
5757

5858
$GLOBALS['reload'] = 1;
5959
}
6060

61-
if (! empty($GLOBALS['sql_query'])) {
62-
$GLOBALS['sql_query'] .= ';';
61+
if (Current::$sqlQuery !== '') {
62+
Current::$sqlQuery .= ';';
6363
} elseif ($sqlQueryViews !== '') {
64-
$GLOBALS['sql_query'] = $sqlQueryViews . ';';
64+
Current::$sqlQuery = $sqlQueryViews . ';';
6565
$sqlQueryViews = '';
6666
}
6767

@@ -79,14 +79,14 @@ public function __invoke(ServerRequest $request): Response
7979
$GLOBALS['message'] = Message::success();
8080

8181
$this->dbi->selectDb(Current::$database);
82-
$result = $this->dbi->tryQuery($GLOBALS['sql_query']);
82+
$result = $this->dbi->tryQuery(Current::$sqlQuery);
8383

8484
if (! $result) {
8585
$GLOBALS['message'] = Message::error($this->dbi->getError());
8686
}
8787

8888
if ($result && $sqlQueryViews !== '') {
89-
$GLOBALS['sql_query'] .= ' ' . $sqlQueryViews . ';';
89+
Current::$sqlQuery .= ' ' . $sqlQueryViews . ';';
9090
$result = $this->dbi->tryQuery($sqlQueryViews);
9191
unset($sqlQueryViews);
9292
}

‎src/Controllers/Database/Structure/EmptyTableController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function __invoke(ServerRequest $request): Response
5454

5555
$defaultFkCheckValue = ForeignKey::handleDisableCheckInit();
5656

57-
$GLOBALS['sql_query'] = '';
57+
Current::$sqlQuery = '';
5858

5959
$this->dbi->selectDb(Current::$database);
6060

@@ -66,7 +66,7 @@ public function __invoke(ServerRequest $request): Response
6666
$aQuery = 'TRUNCATE ';
6767
$aQuery .= Util::backquote($selectedValue);
6868

69-
$GLOBALS['sql_query'] .= $aQuery . ';' . "\n";
69+
Current::$sqlQuery .= $aQuery . ';' . "\n";
7070
$this->dbi->query($aQuery);
7171
}
7272

‎src/Controllers/Database/Structure/ReplacePrefixController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function __invoke(ServerRequest $request): Response
3535
$fromPrefix = $request->getParsedBodyParamAsString('from_prefix', '');
3636
$toPrefix = $request->getParsedBodyParamAsString('to_prefix', '');
3737

38-
$GLOBALS['sql_query'] = '';
38+
Current::$sqlQuery = '';
3939

4040
$this->dbi->selectDb(Current::$database);
4141

@@ -51,13 +51,13 @@ public function __invoke(ServerRequest $request): Response
5151
$aQuery = 'ALTER TABLE ' . Util::backquote($selectedValue)
5252
. ' RENAME ' . Util::backquote($newTableName);
5353

54-
$GLOBALS['sql_query'] .= $aQuery . ';' . "\n";
54+
Current::$sqlQuery .= $aQuery . ';' . "\n";
5555
$this->dbi->query($aQuery);
5656
}
5757

5858
$GLOBALS['message'] = Message::success();
5959

60-
$this->flashMessenger->addMessage('success', $GLOBALS['message']->getMessage(), $GLOBALS['sql_query']);
60+
$this->flashMessenger->addMessage('success', $GLOBALS['message']->getMessage(), Current::$sqlQuery);
6161

6262
return $this->responseFactory->createResponse(StatusCodeInterface::STATUS_FOUND)
6363
->withHeader('Location', Url::getFromRoute('/database/structure', ['db' => Current::$database]));

‎src/Controllers/Export/ExportController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public function __invoke(ServerRequest $request): Response
178178
'table' => Current::$table,
179179
]);
180180
} elseif ($GLOBALS['export_type'] === 'raw') {
181-
$GLOBALS['errorUrl'] = Url::getFromRoute('/server/export', ['sql_query' => $GLOBALS['sql_query']]);
181+
$GLOBALS['errorUrl'] = Url::getFromRoute('/server/export', ['sql_query' => Current::$sqlQuery]);
182182
} else {
183183
$this->response->setRequestStatus(false);
184184
$this->response->addHTML(Message::error(__('Bad parameters!'))->getDisplay());
@@ -189,7 +189,7 @@ public function __invoke(ServerRequest $request): Response
189189
// Merge SQL Query aliases with Export aliases from
190190
// export page, Export page aliases are given more
191191
// preference over SQL Query aliases.
192-
$parser = new Parser($GLOBALS['sql_query']);
192+
$parser = new Parser(Current::$sqlQuery);
193193
$aliases = [];
194194
if (! empty($parser->statements[0]) && $parser->statements[0] instanceof SelectStatement) {
195195
$aliases = $parser->statements[0]->getAliases(Current::$database);
@@ -426,7 +426,7 @@ public function __invoke(ServerRequest $request): Response
426426
$exportPlugin,
427427
$GLOBALS['errorUrl'],
428428
Current::$database,
429-
$GLOBALS['sql_query'],
429+
Current::$sqlQuery,
430430
);
431431
} else {
432432
// We export just one table
@@ -452,7 +452,7 @@ public function __invoke(ServerRequest $request): Response
452452
$allrows,
453453
$limitTo,
454454
$limitFrom,
455-
$GLOBALS['sql_query'],
455+
Current::$sqlQuery,
456456
$aliases,
457457
);
458458
} finally {
@@ -473,7 +473,7 @@ public function __invoke(ServerRequest $request): Response
473473
$allrows,
474474
$limitTo,
475475
$limitFrom,
476-
$GLOBALS['sql_query'],
476+
Current::$sqlQuery,
477477
$aliases,
478478
);
479479
}

0 commit comments

Comments
 (0)