gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove $GLOBALS['is_gotofile']

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2023-12-15 20:12:50 +01:00
parent d204a758fd
commit 4ea2b81612
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpstan-baseline.neon
View File

@ -5280,11 +5280,6 @@ parameters:
count: 1
path: src/Controllers/Sql/SqlController.php
-
message: "#^Parameter \\#2 \\$isGotoFile of method PhpMyAdmin\\\\Sql\\:\\:executeQueryAndSendQueryResponse\\(\\) expects bool, mixed given\\.$#"
count: 1
path: src/Controllers/Sql/SqlController.php
-
message: "#^Parameter \\#2 \\$signature of static method PhpMyAdmin\\\\Core\\:\\:checkSqlQuerySignature\\(\\) expects string, mixed given\\.$#"
count: 1

2
psalm-baseline.xml
View File

@ -3207,7 +3207,6 @@
<code><![CDATA[$GLOBALS['disp_message']]]></code>
<code><![CDATA[$GLOBALS['disp_query']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['is_gotofile']]]></code>
<code><![CDATA[$GLOBALS['message_to_show']]]></code>
<code><![CDATA[$GLOBALS['table_from_sql']]]></code>
<code><![CDATA[$GLOBALS['unlim_num_rows']]]></code>
@ -3232,7 +3231,6 @@
<code><![CDATA[$GLOBALS['disp_query']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['is_gotofile']]]></code>
<code><![CDATA[$GLOBALS['message_to_show']]]></code>
<code><![CDATA[$GLOBALS['sql_query']]]></code>
<code><![CDATA[$GLOBALS['table_from_sql']]]></code>

7
src/Controllers/Sql/SqlController.php
View File

@ -53,7 +53,6 @@ class SqlController extends AbstractController
$GLOBALS['message_to_show'] ??= null;
$GLOBALS['disp_message'] ??= null;
$GLOBALS['complete_query'] ??= null;
$GLOBALS['is_gotofile'] ??= null;
$GLOBALS['back'] ??= null;
$GLOBALS['table_from_sql'] ??= null;
@ -80,7 +79,7 @@ class SqlController extends AbstractController
/**
* Defines the url to return to in case of error in a sql statement
*/
$GLOBALS['is_gotofile'] = true;
$isGotofile = true;
$config = Config::getInstance();
if (empty($GLOBALS['goto'])) {
if (empty($GLOBALS['table'])) {
@ -186,7 +185,7 @@ class SqlController extends AbstractController
* Sets or modifies the $goto variable if required
*/
if ($GLOBALS['goto'] === Url::getFromRoute('/sql')) {
$GLOBALS['is_gotofile'] = false;
$isGotofile = false;
$GLOBALS['goto'] = Url::getFromRoute('/sql', [
'db' => $GLOBALS['db'],
'table' => $GLOBALS['table'],
@ -196,7 +195,7 @@ class SqlController extends AbstractController
$this->response->addHTML($this->sql->executeQueryAndSendQueryResponse(
$statementInfo,
$GLOBALS['is_gotofile'],
$isGotofile,
$GLOBALS['db'],
$GLOBALS['table'],
$GLOBALS['import_text'] ?? null,