Visitar URL original
Merge #19908 - getting rid of superglobal use · phpmyadmin/phpmyadmin@b3c3f5e · GitHub
Skip to content

Commit b3c3f5e

Browse files
committed
Merge #19908 - getting rid of superglobal use
Closes #19908 Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2 parents 8b43d27 + 959d251 commit b3c3f5e

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

‎psalm-baseline.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2322,6 +2322,8 @@
23222322
</MixedArrayAccess>
23232323
<MixedAssignment>
23242324
<code><![CDATA[$idKey]]></code>
2325+
<code><![CDATA[$localImportFile]]></code>
2326+
<code><![CDATA[$timeoutPassed]]></code>
23252327
</MixedAssignment>
23262328
<MixedMethodCall>
23272329
<code><![CDATA[$_SESSION[Ajax::SESSION_KEY]['handler']::getIdKey()]]></code>

‎src/Controllers/Table/ImportController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ public function __invoke(ServerRequest $request): Response
103103
}
104104

105105
$offset = null;
106-
if (isset($_REQUEST['offset']) && is_numeric($_REQUEST['offset'])) {
107-
$offset = (int) $_REQUEST['offset'];
106+
if (is_numeric($request->getParam('offset'))) {
107+
$offset = (int) $request->getParam('offset');
108108
}
109109

110-
$timeoutPassed = $_REQUEST['timeout_passed'] ?? null;
111-
$localImportFile = $_REQUEST['local_import_file'] ?? null;
110+
$timeoutPassed = $request->getParam('timeout_passed');
111+
$localImportFile = $request->getParam('local_import_file');
112112
$compressions = Import::getCompressions();
113113

114114
$charsets = Charsets::getCharsets($this->dbi, $this->config->selectedServer['DisableIS']);

0 commit comments

Comments
 (0)