diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 9dea1a0c45..d7837737b2 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -2128,7 +2128,6 @@ - diff --git a/src/Controllers/Import/ImportController.php b/src/Controllers/Import/ImportController.php index d1ae4b2471..92075ddc2b 100644 --- a/src/Controllers/Import/ImportController.php +++ b/src/Controllers/Import/ImportController.php @@ -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'); diff --git a/src/Import/Import.php b/src/Import/Import.php index ec51dd24b0..f57d4bf9eb 100644 --- a/src/Import/Import.php +++ b/src/Import/Import.php @@ -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');