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

Trim $GLOBALS['my_die']

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2023-12-08 19:12:18 +01:00
parent fc82232b15
commit 4f2b92a2af
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
psalm-baseline.xml
View File

@ -2128,7 +2128,6 @@
<code><![CDATA[$GLOBALS['max_sql_len']]]></code>
<code><![CDATA[$GLOBALS['message_to_show']]]></code>
<code><![CDATA[$GLOBALS['msg']]]></code>
<code><![CDATA[$GLOBALS['my_die']]]></code>
<code><![CDATA[$GLOBALS['noplugin']]]></code>
<code><![CDATA[$GLOBALS['read_multiply']]]></code>
<code><![CDATA[$GLOBALS['reset_charset']]]></code>

1
src/Controllers/Import/ImportController.php
View File

@ -94,7 +94,6 @@ final class ImportController extends AbstractController
$GLOBALS['import_file_name'] ??= null;
$GLOBALS['import_notice'] ??= null;
$GLOBALS['read_multiply'] ??= null;
$GLOBALS['my_die'] ??= null;
$GLOBALS['active_page'] ??= null;
$GLOBALS['charset_of_file'] = $request->getParsedBodyParam('charset_of_file');

6
src/Import/Import.php
View File

@ -127,7 +127,6 @@ class Import
*/
public function executeQuery(string $sql, array &$sqlData): void
{
$GLOBALS['my_die'] ??= null;
$GLOBALS['error'] ??= null;
$GLOBALS['msg'] ??= null;
$GLOBALS['sql_query_disabled'] ??= null;
@ -140,10 +139,7 @@ class Import
$GLOBALS['msg'] = '# ';
if ($GLOBALS['result'] === false) { // execution failed
if (! isset($GLOBALS['my_die'])) {
$GLOBALS['my_die'] = [];
}
$GLOBALS['my_die'] ??= [];
$GLOBALS['my_die'][] = ['sql' => $sql, 'error' => $dbi->getError()];
$GLOBALS['msg'] .= __('Error');