diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php index ff902552e6..868b746ba3 100644 --- a/libraries/classes/BrowseForeigners.php +++ b/libraries/classes/BrowseForeigners.php @@ -65,7 +65,7 @@ class BrowseForeigners int $indexByDescription, string $currentValue ): array { - $GLOBALS['theme'] = $GLOBALS['theme'] ?? null; + $GLOBALS['theme'] ??= null; $horizontalCount++; $output = ''; diff --git a/libraries/classes/Command/CacheWarmupCommand.php b/libraries/classes/Command/CacheWarmupCommand.php index c8daef9b67..38c52ee4e4 100644 --- a/libraries/classes/Command/CacheWarmupCommand.php +++ b/libraries/classes/Command/CacheWarmupCommand.php @@ -119,7 +119,7 @@ final class CacheWarmupCommand extends Command string $environment, bool $writeReplacements ): int { - $GLOBALS['config'] = $GLOBALS['config'] ?? null; + $GLOBALS['config'] ??= null; $output->writeln('Warming up the twig cache', OutputInterface::VERBOSITY_VERBOSE); $GLOBALS['config'] = new Config(); diff --git a/libraries/classes/Common.php b/libraries/classes/Common.php index 335bb61150..f4826fc9f3 100644 --- a/libraries/classes/Common.php +++ b/libraries/classes/Common.php @@ -89,10 +89,10 @@ final class Common */ public static function run(bool $isSetupPage = false): void { - $GLOBALS['lang'] = $GLOBALS['lang'] ?? null; - $GLOBALS['theme'] = $GLOBALS['theme'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['token_mismatch'] = $GLOBALS['token_mismatch'] ?? null; + $GLOBALS['lang'] ??= null; + $GLOBALS['theme'] ??= null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['token_mismatch'] ??= null; $request = self::getRequest(); $route = $request->getRoute(); @@ -454,8 +454,8 @@ final class Common private static function setGotoAndBackGlobals(ContainerInterface $container, Config $config): void { - $GLOBALS['back'] = $GLOBALS['back'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; + $GLOBALS['back'] ??= null; + $GLOBALS['urlParams'] ??= null; // Holds page that should be displayed. $GLOBALS['goto'] = ''; @@ -535,7 +535,7 @@ final class Common private static function setDatabaseAndTableFromRequest(ContainerInterface $container, ServerRequest $request): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; + $GLOBALS['urlParams'] ??= null; $db = DatabaseName::tryFromValue($request->getParam('db')); $table = TableName::tryFromValue($request->getParam('table')); diff --git a/libraries/classes/Controllers/AbstractController.php b/libraries/classes/Controllers/AbstractController.php index dceb41e99f..da12d352b4 100644 --- a/libraries/classes/Controllers/AbstractController.php +++ b/libraries/classes/Controllers/AbstractController.php @@ -48,8 +48,8 @@ abstract class AbstractController protected function hasDatabase(): bool { - $GLOBALS['errno'] = $GLOBALS['errno'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['errno'] ??= null; + $GLOBALS['message'] ??= null; if (isset($GLOBALS['is_db']) && $GLOBALS['is_db']) { return true; diff --git a/libraries/classes/Controllers/Database/CentralColumnsController.php b/libraries/classes/Controllers/Database/CentralColumnsController.php index 2f3f9a411a..50a5d8396a 100644 --- a/libraries/classes/Controllers/Database/CentralColumnsController.php +++ b/libraries/classes/Controllers/Database/CentralColumnsController.php @@ -35,8 +35,8 @@ class CentralColumnsController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['message'] = $GLOBALS['message'] ?? null; - $GLOBALS['num_cols'] = $GLOBALS['num_cols'] ?? null; + $GLOBALS['message'] ??= null; + $GLOBALS['num_cols'] ??= null; if ($request->hasBodyParam('edit_save')) { echo $this->editSave([ @@ -156,7 +156,7 @@ class CentralColumnsController extends AbstractController */ public function main(array $params): void { - $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; + $GLOBALS['text_dir'] ??= null; if (! empty($params['total_rows']) && is_numeric($params['total_rows'])) { $totalRows = (int) $params['total_rows']; diff --git a/libraries/classes/Controllers/Database/DesignerController.php b/libraries/classes/Controllers/Database/DesignerController.php index 8add231277..641d5421e4 100644 --- a/libraries/classes/Controllers/Database/DesignerController.php +++ b/libraries/classes/Controllers/Database/DesignerController.php @@ -37,8 +37,8 @@ class DesignerController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['message'] = $GLOBALS['message'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['message'] ??= null; + $GLOBALS['errorUrl'] ??= null; $db = $request->getParsedBodyParam('db'); $table = $request->getParsedBodyParam('table'); diff --git a/libraries/classes/Controllers/Database/EventsController.php b/libraries/classes/Controllers/Database/EventsController.php index b687153eae..f2c1751382 100644 --- a/libraries/classes/Controllers/Database/EventsController.php +++ b/libraries/classes/Controllers/Database/EventsController.php @@ -34,9 +34,9 @@ final class EventsController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errors'] = $GLOBALS['errors'] ?? null; - $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errors'] ??= null; + $GLOBALS['text_dir'] ??= null; + $GLOBALS['errorUrl'] ??= null; $this->addScriptFiles(['database/events.js']); diff --git a/libraries/classes/Controllers/Database/ExportController.php b/libraries/classes/Controllers/Database/ExportController.php index 7959160616..dfdc1e55bc 100644 --- a/libraries/classes/Controllers/Database/ExportController.php +++ b/libraries/classes/Controllers/Database/ExportController.php @@ -39,11 +39,11 @@ final class ExportController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['tables'] = $GLOBALS['tables'] ?? null; - $GLOBALS['table_select'] = $GLOBALS['table_select'] ?? null; - $GLOBALS['unlim_num_rows'] = $GLOBALS['unlim_num_rows'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['tables'] ??= null; + $GLOBALS['table_select'] ??= null; + $GLOBALS['unlim_num_rows'] ??= null; + $GLOBALS['errorUrl'] ??= null; $pageSettings = new PageSettings('Export'); $pageSettingsErrorHtml = $pageSettings->getErrorHTML(); diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php index fe1303567d..eb077e6bd6 100644 --- a/libraries/classes/Controllers/Database/ImportController.php +++ b/libraries/classes/Controllers/Database/ImportController.php @@ -36,8 +36,8 @@ final class ImportController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['SESSION_KEY'] = $GLOBALS['SESSION_KEY'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['SESSION_KEY'] ??= null; + $GLOBALS['errorUrl'] ??= null; $pageSettings = new PageSettings('Import'); $pageSettingsErrorHtml = $pageSettings->getErrorHTML(); diff --git a/libraries/classes/Controllers/Database/Operations/CollationController.php b/libraries/classes/Controllers/Database/Operations/CollationController.php index 63e3b14a17..6a9d36c347 100644 --- a/libraries/classes/Controllers/Database/Operations/CollationController.php +++ b/libraries/classes/Controllers/Database/Operations/CollationController.php @@ -35,7 +35,7 @@ final class CollationController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; if (! $this->response->isAjax()) { return; diff --git a/libraries/classes/Controllers/Database/OperationsController.php b/libraries/classes/Controllers/Database/OperationsController.php index 50d77a9d54..125f2a6b45 100644 --- a/libraries/classes/Controllers/Database/OperationsController.php +++ b/libraries/classes/Controllers/Database/OperationsController.php @@ -61,12 +61,12 @@ class OperationsController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['server'] = $GLOBALS['server'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['reload'] = $GLOBALS['reload'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['single_table'] = $GLOBALS['single_table'] ?? null; + $GLOBALS['server'] ??= null; + $GLOBALS['message'] ??= null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['reload'] ??= null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['single_table'] ??= null; $this->checkUserPrivileges->getPrivileges(); diff --git a/libraries/classes/Controllers/Database/QueryByExampleController.php b/libraries/classes/Controllers/Database/QueryByExampleController.php index 0e24bc3b1b..49ac5c8718 100644 --- a/libraries/classes/Controllers/Database/QueryByExampleController.php +++ b/libraries/classes/Controllers/Database/QueryByExampleController.php @@ -42,12 +42,12 @@ class QueryByExampleController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['savedSearchList'] = $GLOBALS['savedSearchList'] ?? null; - $GLOBALS['savedSearch'] = $GLOBALS['savedSearch'] ?? null; - $GLOBALS['currentSearchId'] = $GLOBALS['currentSearchId'] ?? null; - $GLOBALS['goto'] = $GLOBALS['goto'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['savedSearchList'] ??= null; + $GLOBALS['savedSearch'] ??= null; + $GLOBALS['currentSearchId'] ??= null; + $GLOBALS['goto'] ??= null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; $savedQbeSearchesFeature = $this->relation->getRelationParameters()->savedQueryByExampleSearchesFeature; diff --git a/libraries/classes/Controllers/Database/RoutinesController.php b/libraries/classes/Controllers/Database/RoutinesController.php index 7f463b4175..6b1cb2e4be 100644 --- a/libraries/classes/Controllers/Database/RoutinesController.php +++ b/libraries/classes/Controllers/Database/RoutinesController.php @@ -44,9 +44,9 @@ class RoutinesController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errors'] = $GLOBALS['errors'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; + $GLOBALS['errors'] ??= null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['urlParams'] ??= null; $this->addScriptFiles(['database/routines.js']); diff --git a/libraries/classes/Controllers/Database/SearchController.php b/libraries/classes/Controllers/Database/SearchController.php index df260e68a3..1a5d4110f2 100644 --- a/libraries/classes/Controllers/Database/SearchController.php +++ b/libraries/classes/Controllers/Database/SearchController.php @@ -29,8 +29,8 @@ class SearchController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['urlParams'] ??= null; $this->addScriptFiles(['database/search.js', 'sql.js', 'makegrid.js']); diff --git a/libraries/classes/Controllers/Database/SqlController.php b/libraries/classes/Controllers/Database/SqlController.php index 8dc0051cb3..21108d6c08 100644 --- a/libraries/classes/Controllers/Database/SqlController.php +++ b/libraries/classes/Controllers/Database/SqlController.php @@ -30,9 +30,9 @@ class SqlController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['goto'] = $GLOBALS['goto'] ?? null; - $GLOBALS['back'] = $GLOBALS['back'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['goto'] ??= null; + $GLOBALS['back'] ??= null; + $GLOBALS['errorUrl'] ??= null; $this->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']); diff --git a/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php b/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php index 7a9cc0c68e..9929f6092f 100644 --- a/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php +++ b/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php @@ -34,7 +34,7 @@ final class AddController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['message'] ??= null; $selected = $_POST['selected_tbl'] ?? []; diff --git a/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php b/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php index 39b5d7a481..20d88e252e 100644 --- a/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php +++ b/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php @@ -34,7 +34,7 @@ final class MakeConsistentController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['message'] ??= null; $selected = $_POST['selected_tbl'] ?? []; diff --git a/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php b/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php index e275b0f650..d1876c5bc2 100644 --- a/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php +++ b/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php @@ -34,7 +34,7 @@ final class RemoveController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['message'] ??= null; $selected = $_POST['selected_tbl'] ?? []; diff --git a/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php b/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php index 4f70e251d7..6b68f8e9a0 100644 --- a/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php +++ b/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php @@ -32,7 +32,7 @@ final class FavoriteTableController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; $parameters = [ 'favorite_table' => $_REQUEST['favorite_table'] ?? null, diff --git a/libraries/classes/Controllers/Database/Structure/RealRowCountController.php b/libraries/classes/Controllers/Database/Structure/RealRowCountController.php index 70824764b3..0dda649d5d 100644 --- a/libraries/classes/Controllers/Database/Structure/RealRowCountController.php +++ b/libraries/classes/Controllers/Database/Structure/RealRowCountController.php @@ -29,7 +29,7 @@ final class RealRowCountController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; $parameters = [ 'real_row_count_all' => $_REQUEST['real_row_count_all'] ?? null, diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php index 0600b4cb67..4a41875873 100644 --- a/libraries/classes/Controllers/Database/StructureController.php +++ b/libraries/classes/Controllers/Database/StructureController.php @@ -125,7 +125,7 @@ class StructureController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; $parameters = [ 'sort' => $_REQUEST['sort'] ?? null, diff --git a/libraries/classes/Controllers/Database/TrackingController.php b/libraries/classes/Controllers/Database/TrackingController.php index 73432be3d0..a892eb4832 100644 --- a/libraries/classes/Controllers/Database/TrackingController.php +++ b/libraries/classes/Controllers/Database/TrackingController.php @@ -45,9 +45,9 @@ class TrackingController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['text_dir'] ??= null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; $this->addScriptFiles(['vendor/jquery/jquery.tablesorter.js', 'database/tracking.js']); diff --git a/libraries/classes/Controllers/Database/TriggersController.php b/libraries/classes/Controllers/Database/TriggersController.php index 534523c301..01f7abe4ba 100644 --- a/libraries/classes/Controllers/Database/TriggersController.php +++ b/libraries/classes/Controllers/Database/TriggersController.php @@ -39,9 +39,9 @@ class TriggersController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errors'] = $GLOBALS['errors'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errors'] ??= null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; $this->addScriptFiles(['database/triggers.js']); diff --git a/libraries/classes/Controllers/Export/ExportController.php b/libraries/classes/Controllers/Export/ExportController.php index f66ee3efad..5611072580 100644 --- a/libraries/classes/Controllers/Export/ExportController.php +++ b/libraries/classes/Controllers/Export/ExportController.php @@ -48,25 +48,25 @@ final class ExportController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['export_type'] = $GLOBALS['export_type'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; - $GLOBALS['compression'] = $GLOBALS['compression'] ?? null; - $GLOBALS['asfile'] = $GLOBALS['asfile'] ?? null; - $GLOBALS['buffer_needed'] = $GLOBALS['buffer_needed'] ?? null; - $GLOBALS['save_on_server'] = $GLOBALS['save_on_server'] ?? null; - $GLOBALS['file_handle'] = $GLOBALS['file_handle'] ?? null; - $GLOBALS['output_charset_conversion'] = $GLOBALS['output_charset_conversion'] ?? null; - $GLOBALS['output_kanji_conversion'] = $GLOBALS['output_kanji_conversion'] ?? null; - $GLOBALS['what'] = $GLOBALS['what'] ?? null; - $GLOBALS['single_table'] = $GLOBALS['single_table'] ?? null; - $GLOBALS['save_filename'] = $GLOBALS['save_filename'] ?? null; - $GLOBALS['tables'] = $GLOBALS['tables'] ?? null; - $GLOBALS['table_select'] = $GLOBALS['table_select'] ?? null; - $GLOBALS['time_start'] = $GLOBALS['time_start'] ?? null; - $GLOBALS['charset'] = $GLOBALS['charset'] ?? null; - $GLOBALS['active_page'] = $GLOBALS['active_page'] ?? null; - $GLOBALS['table_data'] = $GLOBALS['table_data'] ?? null; + $GLOBALS['export_type'] ??= null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['message'] ??= null; + $GLOBALS['compression'] ??= null; + $GLOBALS['asfile'] ??= null; + $GLOBALS['buffer_needed'] ??= null; + $GLOBALS['save_on_server'] ??= null; + $GLOBALS['file_handle'] ??= null; + $GLOBALS['output_charset_conversion'] ??= null; + $GLOBALS['output_kanji_conversion'] ??= null; + $GLOBALS['what'] ??= null; + $GLOBALS['single_table'] ??= null; + $GLOBALS['save_filename'] ??= null; + $GLOBALS['tables'] ??= null; + $GLOBALS['table_select'] ??= null; + $GLOBALS['time_start'] ??= null; + $GLOBALS['charset'] ??= null; + $GLOBALS['active_page'] ??= null; + $GLOBALS['table_data'] ??= null; /** @var array $postParams */ $postParams = $request->getParsedBody(); diff --git a/libraries/classes/Controllers/GisDataEditorController.php b/libraries/classes/Controllers/GisDataEditorController.php index e2aed81716..aa3760c6fa 100644 --- a/libraries/classes/Controllers/GisDataEditorController.php +++ b/libraries/classes/Controllers/GisDataEditorController.php @@ -28,17 +28,17 @@ class GisDataEditorController extends AbstractController { public function __invoke(ServerRequest $request): void { - $GLOBALS['gis_data'] = $GLOBALS['gis_data'] ?? null; - $GLOBALS['gis_types'] = $GLOBALS['gis_types'] ?? null; - $GLOBALS['start'] = $GLOBALS['start'] ?? null; - $GLOBALS['geom_type'] = $GLOBALS['geom_type'] ?? null; - $GLOBALS['gis_obj'] = $GLOBALS['gis_obj'] ?? null; - $GLOBALS['wkt'] = $GLOBALS['wkt'] ?? null; - $GLOBALS['result'] = $GLOBALS['result'] ?? null; - $GLOBALS['visualizationSettings'] = $GLOBALS['visualizationSettings'] ?? null; - $GLOBALS['visualization'] = $GLOBALS['visualization'] ?? null; - $GLOBALS['open_layers'] = $GLOBALS['open_layers'] ?? null; - $GLOBALS['geom_count'] = $GLOBALS['geom_count'] ?? null; + $GLOBALS['gis_data'] ??= null; + $GLOBALS['gis_types'] ??= null; + $GLOBALS['start'] ??= null; + $GLOBALS['geom_type'] ??= null; + $GLOBALS['gis_obj'] ??= null; + $GLOBALS['wkt'] ??= null; + $GLOBALS['result'] ??= null; + $GLOBALS['visualizationSettings'] ??= null; + $GLOBALS['visualization'] ??= null; + $GLOBALS['open_layers'] ??= null; + $GLOBALS['geom_count'] ??= null; /** @var string|null $field */ $field = $request->getParsedBodyParam('field'); diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php index 335aaab33b..24fd612c3a 100644 --- a/libraries/classes/Controllers/HomeController.php +++ b/libraries/classes/Controllers/HomeController.php @@ -64,11 +64,11 @@ class HomeController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['server'] = $GLOBALS['server'] ?? null; - $GLOBALS['collation_connection'] = $GLOBALS['collation_connection'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; - $GLOBALS['show_query'] = $GLOBALS['show_query'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['server'] ??= null; + $GLOBALS['collation_connection'] ??= null; + $GLOBALS['message'] ??= null; + $GLOBALS['show_query'] ??= null; + $GLOBALS['errorUrl'] ??= null; if ($this->response->isAjax() && ! empty($_REQUEST['access_time'])) { return; @@ -251,7 +251,7 @@ class HomeController extends AbstractController private function checkRequirements(): void { - $GLOBALS['server'] = $GLOBALS['server'] ?? null; + $GLOBALS['server'] ??= null; $this->checkPhpExtensionsRequirements(); @@ -397,7 +397,7 @@ class HomeController extends AbstractController private function checkLanguageStats(): void { - $GLOBALS['lang'] = $GLOBALS['lang'] ?? null; + $GLOBALS['lang'] ??= null; /** * Warning about incomplete translations. diff --git a/libraries/classes/Controllers/Import/ImportController.php b/libraries/classes/Controllers/Import/ImportController.php index 646c355918..71e4ba1db1 100644 --- a/libraries/classes/Controllers/Import/ImportController.php +++ b/libraries/classes/Controllers/Import/ImportController.php @@ -71,40 +71,40 @@ final class ImportController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['collation_connection'] = $GLOBALS['collation_connection'] ?? null; - $GLOBALS['goto'] = $GLOBALS['goto'] ?? null; - $GLOBALS['display_query'] = $GLOBALS['display_query'] ?? null; - $GLOBALS['ajax_reload'] = $GLOBALS['ajax_reload'] ?? null; - $GLOBALS['import_text'] = $GLOBALS['import_text'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['memory_limit'] = $GLOBALS['memory_limit'] ?? null; - $GLOBALS['read_limit'] = $GLOBALS['read_limit'] ?? null; - $GLOBALS['finished'] = $GLOBALS['finished'] ?? null; - $GLOBALS['offset'] = $GLOBALS['offset'] ?? null; - $GLOBALS['charset_conversion'] = $GLOBALS['charset_conversion'] ?? null; - $GLOBALS['timestamp'] = $GLOBALS['timestamp'] ?? null; - $GLOBALS['maximum_time'] = $GLOBALS['maximum_time'] ?? null; - $GLOBALS['timeout_passed'] = $GLOBALS['timeout_passed'] ?? null; - $GLOBALS['import_file'] = $GLOBALS['import_file'] ?? null; - $GLOBALS['go_sql'] = $GLOBALS['go_sql'] ?? null; - $GLOBALS['sql_file'] = $GLOBALS['sql_file'] ?? null; - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['max_sql_len'] = $GLOBALS['max_sql_len'] ?? null; - $GLOBALS['msg'] = $GLOBALS['msg'] ?? null; - $GLOBALS['sql_query_disabled'] = $GLOBALS['sql_query_disabled'] ?? null; - $GLOBALS['executed_queries'] = $GLOBALS['executed_queries'] ?? null; - $GLOBALS['run_query'] = $GLOBALS['run_query'] ?? null; - $GLOBALS['reset_charset'] = $GLOBALS['reset_charset'] ?? null; - $GLOBALS['result'] = $GLOBALS['result'] ?? null; - $GLOBALS['import_file_name'] = $GLOBALS['import_file_name'] ?? null; - $GLOBALS['import_notice'] = $GLOBALS['import_notice'] ?? null; - $GLOBALS['read_multiply'] = $GLOBALS['read_multiply'] ?? null; - $GLOBALS['my_die'] = $GLOBALS['my_die'] ?? null; - $GLOBALS['active_page'] = $GLOBALS['active_page'] ?? null; - $GLOBALS['reload'] = $GLOBALS['reload'] ?? null; - $GLOBALS['charset_connection'] = $GLOBALS['charset_connection'] ?? null; + $GLOBALS['collation_connection'] ??= null; + $GLOBALS['goto'] ??= null; + $GLOBALS['display_query'] ??= null; + $GLOBALS['ajax_reload'] ??= null; + $GLOBALS['import_text'] ??= null; + $GLOBALS['message'] ??= null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['memory_limit'] ??= null; + $GLOBALS['read_limit'] ??= null; + $GLOBALS['finished'] ??= null; + $GLOBALS['offset'] ??= null; + $GLOBALS['charset_conversion'] ??= null; + $GLOBALS['timestamp'] ??= null; + $GLOBALS['maximum_time'] ??= null; + $GLOBALS['timeout_passed'] ??= null; + $GLOBALS['import_file'] ??= null; + $GLOBALS['go_sql'] ??= null; + $GLOBALS['sql_file'] ??= null; + $GLOBALS['error'] ??= null; + $GLOBALS['max_sql_len'] ??= null; + $GLOBALS['msg'] ??= null; + $GLOBALS['sql_query_disabled'] ??= null; + $GLOBALS['executed_queries'] ??= null; + $GLOBALS['run_query'] ??= null; + $GLOBALS['reset_charset'] ??= null; + $GLOBALS['result'] ??= null; + $GLOBALS['import_file_name'] ??= null; + $GLOBALS['import_notice'] ??= null; + $GLOBALS['read_multiply'] ??= null; + $GLOBALS['my_die'] ??= null; + $GLOBALS['active_page'] ??= null; + $GLOBALS['reload'] ??= null; + $GLOBALS['charset_connection'] ??= null; $GLOBALS['charset_of_file'] = $request->getParsedBodyParam('charset_of_file'); $GLOBALS['format'] = $request->getParsedBodyParam('format', ''); diff --git a/libraries/classes/Controllers/Import/StatusController.php b/libraries/classes/Controllers/Import/StatusController.php index 7faec2064b..cbfc2fce32 100644 --- a/libraries/classes/Controllers/Import/StatusController.php +++ b/libraries/classes/Controllers/Import/StatusController.php @@ -33,10 +33,10 @@ class StatusController public function __invoke(ServerRequest $request): void { - $GLOBALS['SESSION_KEY'] = $GLOBALS['SESSION_KEY'] ?? null; - $GLOBALS['upload_id'] = $GLOBALS['upload_id'] ?? null; - $GLOBALS['plugins'] = $GLOBALS['plugins'] ?? null; - $GLOBALS['timestamp'] = $GLOBALS['timestamp'] ?? null; + $GLOBALS['SESSION_KEY'] ??= null; + $GLOBALS['upload_id'] ??= null; + $GLOBALS['plugins'] ??= null; + $GLOBALS['timestamp'] ??= null; [ $GLOBALS['SESSION_KEY'], diff --git a/libraries/classes/Controllers/Preferences/ExportController.php b/libraries/classes/Controllers/Preferences/ExportController.php index 1a47131f37..9b64f5e13b 100644 --- a/libraries/classes/Controllers/Preferences/ExportController.php +++ b/libraries/classes/Controllers/Preferences/ExportController.php @@ -42,11 +42,11 @@ class ExportController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['cf'] = $GLOBALS['cf'] ?? null; - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['tabHash'] = $GLOBALS['tabHash'] ?? null; - $GLOBALS['hash'] = $GLOBALS['hash'] ?? null; - $GLOBALS['server'] = $GLOBALS['server'] ?? null; + $GLOBALS['cf'] ??= null; + $GLOBALS['error'] ??= null; + $GLOBALS['tabHash'] ??= null; + $GLOBALS['hash'] ??= null; + $GLOBALS['server'] ??= null; $GLOBALS['cf'] = new ConfigFile($this->config->baseSettings); $this->userPreferences->pageInit($GLOBALS['cf']); diff --git a/libraries/classes/Controllers/Preferences/FeaturesController.php b/libraries/classes/Controllers/Preferences/FeaturesController.php index 92f7fb4a09..99124012a5 100644 --- a/libraries/classes/Controllers/Preferences/FeaturesController.php +++ b/libraries/classes/Controllers/Preferences/FeaturesController.php @@ -42,11 +42,11 @@ class FeaturesController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['cf'] = $GLOBALS['cf'] ?? null; - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['tabHash'] = $GLOBALS['tabHash'] ?? null; - $GLOBALS['hash'] = $GLOBALS['hash'] ?? null; - $GLOBALS['server'] = $GLOBALS['server'] ?? null; + $GLOBALS['cf'] ??= null; + $GLOBALS['error'] ??= null; + $GLOBALS['tabHash'] ??= null; + $GLOBALS['hash'] ??= null; + $GLOBALS['server'] ??= null; $GLOBALS['cf'] = new ConfigFile($this->config->baseSettings); $this->userPreferences->pageInit($GLOBALS['cf']); diff --git a/libraries/classes/Controllers/Preferences/ImportController.php b/libraries/classes/Controllers/Preferences/ImportController.php index 4a87eb0bcb..5572f24b10 100644 --- a/libraries/classes/Controllers/Preferences/ImportController.php +++ b/libraries/classes/Controllers/Preferences/ImportController.php @@ -42,11 +42,11 @@ class ImportController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['cf'] = $GLOBALS['cf'] ?? null; - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['tabHash'] = $GLOBALS['tabHash'] ?? null; - $GLOBALS['hash'] = $GLOBALS['hash'] ?? null; - $GLOBALS['server'] = $GLOBALS['server'] ?? null; + $GLOBALS['cf'] ??= null; + $GLOBALS['error'] ??= null; + $GLOBALS['tabHash'] ??= null; + $GLOBALS['hash'] ??= null; + $GLOBALS['server'] ??= null; $GLOBALS['cf'] = new ConfigFile($this->config->baseSettings); $this->userPreferences->pageInit($GLOBALS['cf']); diff --git a/libraries/classes/Controllers/Preferences/MainPanelController.php b/libraries/classes/Controllers/Preferences/MainPanelController.php index 819fff02cb..ddb38abcff 100644 --- a/libraries/classes/Controllers/Preferences/MainPanelController.php +++ b/libraries/classes/Controllers/Preferences/MainPanelController.php @@ -42,11 +42,11 @@ class MainPanelController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['cf'] = $GLOBALS['cf'] ?? null; - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['tabHash'] = $GLOBALS['tabHash'] ?? null; - $GLOBALS['hash'] = $GLOBALS['hash'] ?? null; - $GLOBALS['server'] = $GLOBALS['server'] ?? null; + $GLOBALS['cf'] ??= null; + $GLOBALS['error'] ??= null; + $GLOBALS['tabHash'] ??= null; + $GLOBALS['hash'] ??= null; + $GLOBALS['server'] ??= null; $GLOBALS['cf'] = new ConfigFile($this->config->baseSettings); $this->userPreferences->pageInit($GLOBALS['cf']); diff --git a/libraries/classes/Controllers/Preferences/ManageController.php b/libraries/classes/Controllers/Preferences/ManageController.php index b62a2c47c2..41a494c784 100644 --- a/libraries/classes/Controllers/Preferences/ManageController.php +++ b/libraries/classes/Controllers/Preferences/ManageController.php @@ -66,15 +66,15 @@ class ManageController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['cf'] = $GLOBALS['cf'] ?? null; - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['json'] = $GLOBALS['json'] ?? null; - $GLOBALS['lang'] = $GLOBALS['lang'] ?? null; - $GLOBALS['new_config'] = $GLOBALS['new_config'] ?? null; - $GLOBALS['return_url'] = $GLOBALS['return_url'] ?? null; - $GLOBALS['form_display'] = $GLOBALS['form_display'] ?? null; - $GLOBALS['all_ok'] = $GLOBALS['all_ok'] ?? null; - $GLOBALS['query'] = $GLOBALS['query'] ?? null; + $GLOBALS['cf'] ??= null; + $GLOBALS['error'] ??= null; + $GLOBALS['json'] ??= null; + $GLOBALS['lang'] ??= null; + $GLOBALS['new_config'] ??= null; + $GLOBALS['return_url'] ??= null; + $GLOBALS['form_display'] ??= null; + $GLOBALS['all_ok'] ??= null; + $GLOBALS['query'] ??= null; $route = $request->getRoute(); diff --git a/libraries/classes/Controllers/Preferences/NavigationController.php b/libraries/classes/Controllers/Preferences/NavigationController.php index f6adca3290..c07274f293 100644 --- a/libraries/classes/Controllers/Preferences/NavigationController.php +++ b/libraries/classes/Controllers/Preferences/NavigationController.php @@ -42,11 +42,11 @@ class NavigationController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['cf'] = $GLOBALS['cf'] ?? null; - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['tabHash'] = $GLOBALS['tabHash'] ?? null; - $GLOBALS['hash'] = $GLOBALS['hash'] ?? null; - $GLOBALS['server'] = $GLOBALS['server'] ?? null; + $GLOBALS['cf'] ??= null; + $GLOBALS['error'] ??= null; + $GLOBALS['tabHash'] ??= null; + $GLOBALS['hash'] ??= null; + $GLOBALS['server'] ??= null; $GLOBALS['cf'] = new ConfigFile($this->config->baseSettings); $this->userPreferences->pageInit($GLOBALS['cf']); diff --git a/libraries/classes/Controllers/Preferences/SqlController.php b/libraries/classes/Controllers/Preferences/SqlController.php index 6bd8d16936..a87496f117 100644 --- a/libraries/classes/Controllers/Preferences/SqlController.php +++ b/libraries/classes/Controllers/Preferences/SqlController.php @@ -42,11 +42,11 @@ class SqlController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['cf'] = $GLOBALS['cf'] ?? null; - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['tabHash'] = $GLOBALS['tabHash'] ?? null; - $GLOBALS['hash'] = $GLOBALS['hash'] ?? null; - $GLOBALS['server'] = $GLOBALS['server'] ?? null; + $GLOBALS['cf'] ??= null; + $GLOBALS['error'] ??= null; + $GLOBALS['tabHash'] ??= null; + $GLOBALS['hash'] ??= null; + $GLOBALS['server'] ??= null; $GLOBALS['cf'] = new ConfigFile($this->config->baseSettings); $this->userPreferences->pageInit($GLOBALS['cf']); diff --git a/libraries/classes/Controllers/Server/Databases/DestroyController.php b/libraries/classes/Controllers/Server/Databases/DestroyController.php index 285dcb84dc..9eede41380 100644 --- a/libraries/classes/Controllers/Server/Databases/DestroyController.php +++ b/libraries/classes/Controllers/Server/Databases/DestroyController.php @@ -43,9 +43,9 @@ final class DestroyController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['selected'] = $GLOBALS['selected'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['reload'] = $GLOBALS['reload'] ?? null; + $GLOBALS['selected'] ??= null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['reload'] ??= null; $selected_dbs = $request->getParsedBodyParam('selected_dbs'); diff --git a/libraries/classes/Controllers/Server/DatabasesController.php b/libraries/classes/Controllers/Server/DatabasesController.php index efeb3684a3..e44328cafa 100644 --- a/libraries/classes/Controllers/Server/DatabasesController.php +++ b/libraries/classes/Controllers/Server/DatabasesController.php @@ -62,11 +62,11 @@ class DatabasesController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['server'] = $GLOBALS['server'] ?? null; - $GLOBALS['is_create_db_priv'] = $GLOBALS['is_create_db_priv'] ?? null; - $GLOBALS['db_to_create'] = $GLOBALS['db_to_create'] ?? null; - $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['server'] ??= null; + $GLOBALS['is_create_db_priv'] ??= null; + $GLOBALS['db_to_create'] ??= null; + $GLOBALS['text_dir'] ??= null; + $GLOBALS['errorUrl'] ??= null; $params = [ 'statistics' => $_REQUEST['statistics'] ?? null, diff --git a/libraries/classes/Controllers/Server/ExportController.php b/libraries/classes/Controllers/Server/ExportController.php index 38d942eee5..9f2b74ab0d 100644 --- a/libraries/classes/Controllers/Server/ExportController.php +++ b/libraries/classes/Controllers/Server/ExportController.php @@ -33,10 +33,10 @@ final class ExportController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['unlim_num_rows'] = $GLOBALS['unlim_num_rows'] ?? null; + $GLOBALS['unlim_num_rows'] ??= null; $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - $GLOBALS['tmp_select'] = $GLOBALS['tmp_select'] ?? null; - $GLOBALS['select_item'] = $GLOBALS['select_item'] ?? null; + $GLOBALS['tmp_select'] ??= null; + $GLOBALS['select_item'] ??= null; if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); diff --git a/libraries/classes/Controllers/Server/ImportController.php b/libraries/classes/Controllers/Server/ImportController.php index cacc8793ed..43edc9a2fb 100644 --- a/libraries/classes/Controllers/Server/ImportController.php +++ b/libraries/classes/Controllers/Server/ImportController.php @@ -36,8 +36,8 @@ final class ImportController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['SESSION_KEY'] = $GLOBALS['SESSION_KEY'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['SESSION_KEY'] ??= null; + $GLOBALS['errorUrl'] ??= null; $pageSettings = new PageSettings('Import'); $pageSettingsErrorHtml = $pageSettings->getErrorHTML(); diff --git a/libraries/classes/Controllers/Server/PrivilegesController.php b/libraries/classes/Controllers/Server/PrivilegesController.php index 6722b4d19b..2e6f8109d4 100644 --- a/libraries/classes/Controllers/Server/PrivilegesController.php +++ b/libraries/classes/Controllers/Server/PrivilegesController.php @@ -50,12 +50,12 @@ class PrivilegesController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; - $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; - $GLOBALS['username'] = $GLOBALS['username'] ?? null; - $GLOBALS['hostname'] = $GLOBALS['hostname'] ?? null; - $GLOBALS['dbname'] = $GLOBALS['dbname'] ?? null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['message'] ??= null; + $GLOBALS['text_dir'] ??= null; + $GLOBALS['username'] ??= null; + $GLOBALS['hostname'] ??= null; + $GLOBALS['dbname'] ??= null; $checkUserPrivileges = new CheckUserPrivileges($this->dbi); $checkUserPrivileges->getPrivileges(); diff --git a/libraries/classes/Controllers/Server/ReplicationController.php b/libraries/classes/Controllers/Server/ReplicationController.php index 7a59d040c8..6b57e8af1e 100644 --- a/libraries/classes/Controllers/Server/ReplicationController.php +++ b/libraries/classes/Controllers/Server/ReplicationController.php @@ -40,8 +40,8 @@ class ReplicationController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; $hasReplicaClearScreen = (bool) $request->getParsedBodyParam('replica_clear_screen'); $replicaConfigure = $request->getParsedBodyParam('replica_configure'); diff --git a/libraries/classes/Controllers/Server/SqlController.php b/libraries/classes/Controllers/Server/SqlController.php index 2d7c467ebf..655d9a008e 100644 --- a/libraries/classes/Controllers/Server/SqlController.php +++ b/libraries/classes/Controllers/Server/SqlController.php @@ -35,7 +35,7 @@ class SqlController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; $this->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']); diff --git a/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php b/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php index db3345ec0c..51454c236d 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php @@ -33,7 +33,7 @@ final class ChartingDataController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; $requiredData = $request->getParsedBodyParam('requiredData', ''); $GLOBALS['errorUrl'] = Url::getFromRoute('/'); diff --git a/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php b/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php index 52bc7d6edd..348a813679 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php @@ -33,7 +33,7 @@ final class GeneralLogController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; $GLOBALS['errorUrl'] = Url::getFromRoute('/'); diff --git a/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php b/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php index 02c466b661..643364728e 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php @@ -33,7 +33,7 @@ final class LogVarsController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; $GLOBALS['errorUrl'] = Url::getFromRoute('/'); diff --git a/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php b/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php index 18a466a6d3..32cd906443 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php @@ -33,7 +33,7 @@ final class QueryAnalyzerController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; $GLOBALS['errorUrl'] = Url::getFromRoute('/'); diff --git a/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php b/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php index 8d159a78de..833115ec05 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php @@ -33,7 +33,7 @@ final class SlowLogController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; $GLOBALS['errorUrl'] = Url::getFromRoute('/'); diff --git a/libraries/classes/Controllers/Server/Status/VariablesController.php b/libraries/classes/Controllers/Server/Status/VariablesController.php index 30221a646d..750b5e5ce2 100644 --- a/libraries/classes/Controllers/Server/Status/VariablesController.php +++ b/libraries/classes/Controllers/Server/Status/VariablesController.php @@ -32,7 +32,7 @@ class VariablesController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; $filterAlert = $request->getParsedBodyParam('filterAlert'); $filterText = $request->getParsedBodyParam('filterText'); diff --git a/libraries/classes/Controllers/Sql/SqlController.php b/libraries/classes/Controllers/Sql/SqlController.php index 3a8aa1c503..32ebad139b 100644 --- a/libraries/classes/Controllers/Sql/SqlController.php +++ b/libraries/classes/Controllers/Sql/SqlController.php @@ -49,21 +49,21 @@ class SqlController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['display_query'] = $GLOBALS['display_query'] ?? null; - $GLOBALS['ajax_reload'] = $GLOBALS['ajax_reload'] ?? null; - $GLOBALS['goto'] = $GLOBALS['goto'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['find_real_end'] = $GLOBALS['find_real_end'] ?? null; - $GLOBALS['unlim_num_rows'] = $GLOBALS['unlim_num_rows'] ?? null; - $GLOBALS['import_text'] = $GLOBALS['import_text'] ?? null; - $GLOBALS['disp_query'] = $GLOBALS['disp_query'] ?? null; - $GLOBALS['extra_data'] = $GLOBALS['extra_data'] ?? null; - $GLOBALS['message_to_show'] = $GLOBALS['message_to_show'] ?? null; - $GLOBALS['disp_message'] = $GLOBALS['disp_message'] ?? null; - $GLOBALS['complete_query'] = $GLOBALS['complete_query'] ?? null; - $GLOBALS['is_gotofile'] = $GLOBALS['is_gotofile'] ?? null; - $GLOBALS['back'] = $GLOBALS['back'] ?? null; - $GLOBALS['table_from_sql'] = $GLOBALS['table_from_sql'] ?? null; + $GLOBALS['display_query'] ??= null; + $GLOBALS['ajax_reload'] ??= null; + $GLOBALS['goto'] ??= null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['find_real_end'] ??= null; + $GLOBALS['unlim_num_rows'] ??= null; + $GLOBALS['import_text'] ??= null; + $GLOBALS['disp_query'] ??= null; + $GLOBALS['extra_data'] ??= null; + $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; $this->checkUserPrivileges->getPrivileges(); diff --git a/libraries/classes/Controllers/Table/AddFieldController.php b/libraries/classes/Controllers/Table/AddFieldController.php index 872de28af3..67fb0f8c4d 100644 --- a/libraries/classes/Controllers/Table/AddFieldController.php +++ b/libraries/classes/Controllers/Table/AddFieldController.php @@ -58,12 +58,12 @@ class AddFieldController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; - $GLOBALS['active_page'] = $GLOBALS['active_page'] ?? null; - $GLOBALS['num_fields'] = $GLOBALS['num_fields'] ?? null; - $GLOBALS['regenerate'] = $GLOBALS['regenerate'] ?? null; - $GLOBALS['result'] = $GLOBALS['result'] ?? null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['message'] ??= null; + $GLOBALS['active_page'] ??= null; + $GLOBALS['num_fields'] ??= null; + $GLOBALS['regenerate'] ??= null; + $GLOBALS['result'] ??= null; /** @var string|null $numberOfFields */ $numberOfFields = $request->getParsedBodyParam('num_fields'); diff --git a/libraries/classes/Controllers/Table/ChangeController.php b/libraries/classes/Controllers/Table/ChangeController.php index b9d9d1e165..2afb15a3df 100644 --- a/libraries/classes/Controllers/Table/ChangeController.php +++ b/libraries/classes/Controllers/Table/ChangeController.php @@ -47,33 +47,33 @@ class ChangeController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; - $GLOBALS['disp_message'] = $GLOBALS['disp_message'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['where_clause'] = $GLOBALS['where_clause'] ?? null; - $GLOBALS['unsaved_values'] = $GLOBALS['unsaved_values'] ?? null; - $GLOBALS['insert_mode'] = $GLOBALS['insert_mode'] ?? null; - $GLOBALS['where_clause_array'] = $GLOBALS['where_clause_array'] ?? null; - $GLOBALS['where_clauses'] = $GLOBALS['where_clauses'] ?? null; - $GLOBALS['result'] = $GLOBALS['result'] ?? null; - $GLOBALS['rows'] = $GLOBALS['rows'] ?? null; - $GLOBALS['found_unique_key'] = $GLOBALS['found_unique_key'] ?? null; - $GLOBALS['after_insert'] = $GLOBALS['after_insert'] ?? null; - $GLOBALS['comments_map'] = $GLOBALS['comments_map'] ?? null; - $GLOBALS['table_columns'] = $GLOBALS['table_columns'] ?? null; - $GLOBALS['timestamp_seen'] = $GLOBALS['timestamp_seen'] ?? null; - $GLOBALS['columns_cnt'] = $GLOBALS['columns_cnt'] ?? null; - $GLOBALS['tabindex'] = $GLOBALS['tabindex'] ?? null; - $GLOBALS['tabindex_for_value'] = $GLOBALS['tabindex_for_value'] ?? null; - $GLOBALS['o_rows'] = $GLOBALS['o_rows'] ?? null; - $GLOBALS['biggest_max_file_size'] = $GLOBALS['biggest_max_file_size'] ?? null; - $GLOBALS['has_blob_field'] = $GLOBALS['has_blob_field'] ?? null; - $GLOBALS['jsvkey'] = $GLOBALS['jsvkey'] ?? null; - $GLOBALS['vkey'] = $GLOBALS['vkey'] ?? null; - $GLOBALS['current_result'] = $GLOBALS['current_result'] ?? null; - $GLOBALS['repopulate'] = $GLOBALS['repopulate'] ?? null; - $GLOBALS['checked'] = $GLOBALS['checked'] ?? null; + $GLOBALS['text_dir'] ??= null; + $GLOBALS['disp_message'] ??= null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['where_clause'] ??= null; + $GLOBALS['unsaved_values'] ??= null; + $GLOBALS['insert_mode'] ??= null; + $GLOBALS['where_clause_array'] ??= null; + $GLOBALS['where_clauses'] ??= null; + $GLOBALS['result'] ??= null; + $GLOBALS['rows'] ??= null; + $GLOBALS['found_unique_key'] ??= null; + $GLOBALS['after_insert'] ??= null; + $GLOBALS['comments_map'] ??= null; + $GLOBALS['table_columns'] ??= null; + $GLOBALS['timestamp_seen'] ??= null; + $GLOBALS['columns_cnt'] ??= null; + $GLOBALS['tabindex'] ??= null; + $GLOBALS['tabindex_for_value'] ??= null; + $GLOBALS['o_rows'] ??= null; + $GLOBALS['biggest_max_file_size'] ??= null; + $GLOBALS['has_blob_field'] ??= null; + $GLOBALS['jsvkey'] ??= null; + $GLOBALS['vkey'] ??= null; + $GLOBALS['current_result'] ??= null; + $GLOBALS['repopulate'] ??= null; + $GLOBALS['checked'] ??= null; $pageSettings = new PageSettings('Edit'); $this->response->addHTML($pageSettings->getErrorHTML()); diff --git a/libraries/classes/Controllers/Table/ChangeRowsController.php b/libraries/classes/Controllers/Table/ChangeRowsController.php index 698a134a55..666970bc88 100644 --- a/libraries/classes/Controllers/Table/ChangeRowsController.php +++ b/libraries/classes/Controllers/Table/ChangeRowsController.php @@ -28,8 +28,8 @@ final class ChangeRowsController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['active_page'] = $GLOBALS['active_page'] ?? null; - $GLOBALS['where_clause'] = $GLOBALS['where_clause'] ?? null; + $GLOBALS['active_page'] ??= null; + $GLOBALS['where_clause'] ??= null; if (isset($_POST['goto']) && (! isset($_POST['rows_to_delete']) || ! is_array($_POST['rows_to_delete']))) { $this->response->setRequestStatus(false); diff --git a/libraries/classes/Controllers/Table/ChartController.php b/libraries/classes/Controllers/Table/ChartController.php index 5c152558cf..42ad5bec17 100644 --- a/libraries/classes/Controllers/Table/ChartController.php +++ b/libraries/classes/Controllers/Table/ChartController.php @@ -44,7 +44,7 @@ class ChartController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; if (isset($_REQUEST['pos'], $_REQUEST['session_max_rows']) && $this->response->isAjax()) { $this->ajax(); @@ -169,8 +169,8 @@ class ChartController extends AbstractController */ public function ajax(): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; if (strlen($GLOBALS['table']) > 0 && strlen($GLOBALS['db']) > 0) { $this->checkParameters(['db', 'table']); diff --git a/libraries/classes/Controllers/Table/DeleteConfirmController.php b/libraries/classes/Controllers/Table/DeleteConfirmController.php index 383ef8bf35..af115a5141 100644 --- a/libraries/classes/Controllers/Table/DeleteConfirmController.php +++ b/libraries/classes/Controllers/Table/DeleteConfirmController.php @@ -18,8 +18,8 @@ final class DeleteConfirmController extends AbstractController { public function __invoke(ServerRequest $request): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; $selected = $_POST['rows_to_delete'] ?? null; diff --git a/libraries/classes/Controllers/Table/DeleteRowsController.php b/libraries/classes/Controllers/Table/DeleteRowsController.php index bb331bfafd..2a48bbdda0 100644 --- a/libraries/classes/Controllers/Table/DeleteRowsController.php +++ b/libraries/classes/Controllers/Table/DeleteRowsController.php @@ -36,10 +36,10 @@ final class DeleteRowsController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['goto'] = $GLOBALS['goto'] ?? null; - $GLOBALS['disp_message'] = $GLOBALS['disp_message'] ?? null; - $GLOBALS['disp_query'] = $GLOBALS['disp_query'] ?? null; - $GLOBALS['active_page'] = $GLOBALS['active_page'] ?? null; + $GLOBALS['goto'] ??= null; + $GLOBALS['disp_message'] ??= null; + $GLOBALS['disp_query'] ??= null; + $GLOBALS['active_page'] ??= null; $mult_btn = $_POST['mult_btn'] ?? ''; $selected = $_POST['selected'] ?? []; diff --git a/libraries/classes/Controllers/Table/ExportController.php b/libraries/classes/Controllers/Table/ExportController.php index 323656ed6e..8aedaeb14e 100644 --- a/libraries/classes/Controllers/Table/ExportController.php +++ b/libraries/classes/Controllers/Table/ExportController.php @@ -38,11 +38,11 @@ class ExportController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['replaces'] = $GLOBALS['replaces'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['where_clause'] = $GLOBALS['where_clause'] ?? null; - $GLOBALS['unlim_num_rows'] = $GLOBALS['unlim_num_rows'] ?? null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['replaces'] ??= null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['where_clause'] ??= null; + $GLOBALS['unlim_num_rows'] ??= null; $pageSettings = new PageSettings('Export'); $pageSettingsErrorHtml = $pageSettings->getErrorHTML(); diff --git a/libraries/classes/Controllers/Table/ExportRowsController.php b/libraries/classes/Controllers/Table/ExportRowsController.php index 5631718974..7b4d638471 100644 --- a/libraries/classes/Controllers/Table/ExportRowsController.php +++ b/libraries/classes/Controllers/Table/ExportRowsController.php @@ -28,9 +28,9 @@ final class ExportRowsController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['active_page'] = $GLOBALS['active_page'] ?? null; - $GLOBALS['single_table'] = $GLOBALS['single_table'] ?? null; - $GLOBALS['where_clause'] = $GLOBALS['where_clause'] ?? null; + $GLOBALS['active_page'] ??= null; + $GLOBALS['single_table'] ??= null; + $GLOBALS['where_clause'] ??= null; if (isset($_POST['goto']) && (! isset($_POST['rows_to_delete']) || ! is_array($_POST['rows_to_delete']))) { $this->response->setRequestStatus(false); diff --git a/libraries/classes/Controllers/Table/FindReplaceController.php b/libraries/classes/Controllers/Table/FindReplaceController.php index b73eb20f5b..af98978ce4 100644 --- a/libraries/classes/Controllers/Table/FindReplaceController.php +++ b/libraries/classes/Controllers/Table/FindReplaceController.php @@ -59,8 +59,8 @@ class FindReplaceController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; $this->checkParameters(['db', 'table']); $GLOBALS['urlParams'] = ['db' => $GLOBALS['db'], 'table' => $GLOBALS['table']]; diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index a3ccf8ae72..051d6a19b6 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -41,8 +41,8 @@ final class GisVisualizationController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; $this->checkParameters(['db']); $GLOBALS['errorUrl'] = Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabDatabase'], 'database'); diff --git a/libraries/classes/Controllers/Table/ImportController.php b/libraries/classes/Controllers/Table/ImportController.php index 63c1cd6d93..96ea1494a6 100644 --- a/libraries/classes/Controllers/Table/ImportController.php +++ b/libraries/classes/Controllers/Table/ImportController.php @@ -40,9 +40,9 @@ final class ImportController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['SESSION_KEY'] = $GLOBALS['SESSION_KEY'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['SESSION_KEY'] ??= null; + $GLOBALS['errorUrl'] ??= null; $pageSettings = new PageSettings('Import'); $pageSettingsErrorHtml = $pageSettings->getErrorHTML(); diff --git a/libraries/classes/Controllers/Table/IndexRenameController.php b/libraries/classes/Controllers/Table/IndexRenameController.php index 68571095ca..8d15aadd46 100644 --- a/libraries/classes/Controllers/Table/IndexRenameController.php +++ b/libraries/classes/Controllers/Table/IndexRenameController.php @@ -36,8 +36,8 @@ final class IndexRenameController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; if (! isset($_POST['create_edit_table'])) { $this->checkParameters(['db', 'table']); diff --git a/libraries/classes/Controllers/Table/IndexesController.php b/libraries/classes/Controllers/Table/IndexesController.php index 69a5e42c6b..2574b4b115 100644 --- a/libraries/classes/Controllers/Table/IndexesController.php +++ b/libraries/classes/Controllers/Table/IndexesController.php @@ -43,8 +43,8 @@ class IndexesController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; if (! isset($_POST['create_edit_table'])) { $this->checkParameters(['db', 'table']); diff --git a/libraries/classes/Controllers/Table/OperationsController.php b/libraries/classes/Controllers/Table/OperationsController.php index 0a55867429..50270f8da7 100644 --- a/libraries/classes/Controllers/Table/OperationsController.php +++ b/libraries/classes/Controllers/Table/OperationsController.php @@ -63,28 +63,28 @@ class OperationsController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['reread_info'] = $GLOBALS['reread_info'] ?? null; - $GLOBALS['tbl_is_view'] = $GLOBALS['tbl_is_view'] ?? null; - $GLOBALS['tbl_storage_engine'] = $GLOBALS['tbl_storage_engine'] ?? null; - $GLOBALS['show_comment'] = $GLOBALS['show_comment'] ?? null; - $GLOBALS['tbl_collation'] = $GLOBALS['tbl_collation'] ?? null; - $GLOBALS['table_info_num_rows'] = $GLOBALS['table_info_num_rows'] ?? null; - $GLOBALS['row_format'] = $GLOBALS['row_format'] ?? null; - $GLOBALS['auto_increment'] = $GLOBALS['auto_increment'] ?? null; - $GLOBALS['create_options'] = $GLOBALS['create_options'] ?? null; - $GLOBALS['table_alters'] = $GLOBALS['table_alters'] ?? null; - $GLOBALS['warning_messages'] = $GLOBALS['warning_messages'] ?? null; - $GLOBALS['reload'] = $GLOBALS['reload'] ?? null; - $GLOBALS['result'] = $GLOBALS['result'] ?? null; - $GLOBALS['new_tbl_storage_engine'] = $GLOBALS['new_tbl_storage_engine'] ?? null; - $GLOBALS['message_to_show'] = $GLOBALS['message_to_show'] ?? null; - $GLOBALS['columns'] = $GLOBALS['columns'] ?? null; - $GLOBALS['hideOrderTable'] = $GLOBALS['hideOrderTable'] ?? null; - $GLOBALS['indexes'] = $GLOBALS['indexes'] ?? null; - $GLOBALS['notNull'] = $GLOBALS['notNull'] ?? null; - $GLOBALS['comment'] = $GLOBALS['comment'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['reread_info'] ??= null; + $GLOBALS['tbl_is_view'] ??= null; + $GLOBALS['tbl_storage_engine'] ??= null; + $GLOBALS['show_comment'] ??= null; + $GLOBALS['tbl_collation'] ??= null; + $GLOBALS['table_info_num_rows'] ??= null; + $GLOBALS['row_format'] ??= null; + $GLOBALS['auto_increment'] ??= null; + $GLOBALS['create_options'] ??= null; + $GLOBALS['table_alters'] ??= null; + $GLOBALS['warning_messages'] ??= null; + $GLOBALS['reload'] ??= null; + $GLOBALS['result'] ??= null; + $GLOBALS['new_tbl_storage_engine'] ??= null; + $GLOBALS['message_to_show'] ??= null; + $GLOBALS['columns'] ??= null; + $GLOBALS['hideOrderTable'] ??= null; + $GLOBALS['indexes'] ??= null; + $GLOBALS['notNull'] ??= null; + $GLOBALS['comment'] ??= null; + $GLOBALS['errorUrl'] ??= null; $this->checkUserPrivileges->getPrivileges(); @@ -145,7 +145,7 @@ class OperationsController extends AbstractController $GLOBALS['create_options']['transactional'] = ($GLOBALS['create_options']['transactional'] ?? '') == '0' ? '0' : '1'; - $GLOBALS['create_options']['page_checksum'] = $GLOBALS['create_options']['page_checksum'] ?? ''; + $GLOBALS['create_options']['page_checksum'] ??= ''; } $pma_table = $this->dbi->getTable($GLOBALS['db'], $GLOBALS['table']); @@ -236,7 +236,7 @@ class OperationsController extends AbstractController if ($pma_table->isEngine('ARIA')) { $GLOBALS['create_options']['transactional'] = ($GLOBALS['create_options']['transactional'] ?? '') == '0' ? '0' : '1'; - $GLOBALS['create_options']['page_checksum'] = $GLOBALS['create_options']['page_checksum'] ?? ''; + $GLOBALS['create_options']['page_checksum'] ??= ''; } } else { $GLOBALS['new_tbl_storage_engine'] = ''; diff --git a/libraries/classes/Controllers/Table/ReplaceController.php b/libraries/classes/Controllers/Table/ReplaceController.php index 75134898ff..cf7e33e9ec 100644 --- a/libraries/classes/Controllers/Table/ReplaceController.php +++ b/libraries/classes/Controllers/Table/ReplaceController.php @@ -66,16 +66,16 @@ final class ReplaceController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['message'] ??= null; $this->checkParameters(['db', 'table', 'goto']); - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['unsaved_values'] = $GLOBALS['unsaved_values'] ?? null; - $GLOBALS['active_page'] = $GLOBALS['active_page'] ?? null; - $GLOBALS['disp_query'] = $GLOBALS['disp_query'] ?? null; - $GLOBALS['disp_message'] = $GLOBALS['disp_message'] ?? null; - $GLOBALS['query'] = $GLOBALS['query'] ?? null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['unsaved_values'] ??= null; + $GLOBALS['active_page'] ??= null; + $GLOBALS['disp_query'] ??= null; + $GLOBALS['disp_message'] ??= null; + $GLOBALS['query'] ??= null; $this->dbi->selectDb($GLOBALS['db']); @@ -171,7 +171,7 @@ final class ReplaceController extends AbstractController // available in $multi_edit_columns_name[$key] // When a select field is nullified, it's not present in $_POST so initialize it - $multi_edit_columns[$key] = $multi_edit_columns[$key] ?? ''; + $multi_edit_columns[$key] ??= ''; /** @var string[]|string $current_value */ $current_value = $multi_edit_columns[$key]; diff --git a/libraries/classes/Controllers/Table/SqlController.php b/libraries/classes/Controllers/Table/SqlController.php index a700dffe5d..19716c3473 100644 --- a/libraries/classes/Controllers/Table/SqlController.php +++ b/libraries/classes/Controllers/Table/SqlController.php @@ -34,9 +34,9 @@ final class SqlController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['goto'] = $GLOBALS['goto'] ?? null; - $GLOBALS['back'] = $GLOBALS['back'] ?? null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['goto'] ??= null; + $GLOBALS['back'] ??= null; $this->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']); diff --git a/libraries/classes/Controllers/Table/Structure/AbstractIndexController.php b/libraries/classes/Controllers/Table/Structure/AbstractIndexController.php index 97332743da..bf92ce7978 100644 --- a/libraries/classes/Controllers/Table/Structure/AbstractIndexController.php +++ b/libraries/classes/Controllers/Table/Structure/AbstractIndexController.php @@ -34,7 +34,7 @@ abstract class AbstractIndexController extends AbstractController public function handleIndexCreation(ServerRequest $request, string $indexType): void { - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['message'] ??= null; $selected = $request->getParsedBodyParam('selected_fld', []); diff --git a/libraries/classes/Controllers/Table/Structure/AddKeyController.php b/libraries/classes/Controllers/Table/Structure/AddKeyController.php index 467726a1b7..d885b8e9b7 100644 --- a/libraries/classes/Controllers/Table/Structure/AddKeyController.php +++ b/libraries/classes/Controllers/Table/Structure/AddKeyController.php @@ -30,7 +30,7 @@ final class AddKeyController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['reload'] = $GLOBALS['reload'] ?? null; + $GLOBALS['reload'] ??= null; ($this->sqlController)($request); diff --git a/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php b/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php index c907f8b5aa..55777d90fb 100644 --- a/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php +++ b/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php @@ -34,7 +34,7 @@ final class CentralColumnsAddController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['message'] ??= null; $selected = $request->getParsedBodyParam('selected_fld', []); diff --git a/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php b/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php index 98eef17798..0a69672919 100644 --- a/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php +++ b/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php @@ -34,7 +34,7 @@ final class CentralColumnsRemoveController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['message'] ??= null; $selected = $request->getParsedBodyParam('selected_fld', []); diff --git a/libraries/classes/Controllers/Table/Structure/ChangeController.php b/libraries/classes/Controllers/Table/Structure/ChangeController.php index 96471966eb..a287601869 100644 --- a/libraries/classes/Controllers/Table/Structure/ChangeController.php +++ b/libraries/classes/Controllers/Table/Structure/ChangeController.php @@ -61,7 +61,7 @@ final class ChangeController extends AbstractController */ private function displayHtmlForColumnChange(array $selected): void { - $GLOBALS['num_fields'] = $GLOBALS['num_fields'] ?? null; + $GLOBALS['num_fields'] ??= null; /** * @todo optimize in case of multiple fields to modify diff --git a/libraries/classes/Controllers/Table/Structure/PrimaryController.php b/libraries/classes/Controllers/Table/Structure/PrimaryController.php index bdd658ddf4..046bdcd69c 100644 --- a/libraries/classes/Controllers/Table/Structure/PrimaryController.php +++ b/libraries/classes/Controllers/Table/Structure/PrimaryController.php @@ -38,9 +38,9 @@ final class PrimaryController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['message'] = $GLOBALS['message'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['message'] ??= null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; /** @var string[]|null $selected */ $selected = $request->getParsedBodyParam('selected_fld', $request->getParsedBodyParam('selected')); diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php index bed79b3a49..55e1324913 100644 --- a/libraries/classes/Controllers/Table/StructureController.php +++ b/libraries/classes/Controllers/Table/StructureController.php @@ -66,13 +66,13 @@ class StructureController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['reread_info'] = $GLOBALS['reread_info'] ?? null; - $GLOBALS['showtable'] = $GLOBALS['showtable'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['tbl_is_view'] = $GLOBALS['tbl_is_view'] ?? null; - $GLOBALS['tbl_storage_engine'] = $GLOBALS['tbl_storage_engine'] ?? null; - $GLOBALS['tbl_collation'] = $GLOBALS['tbl_collation'] ?? null; - $GLOBALS['table_info_num_rows'] = $GLOBALS['table_info_num_rows'] ?? null; + $GLOBALS['reread_info'] ??= null; + $GLOBALS['showtable'] ??= null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['tbl_is_view'] ??= null; + $GLOBALS['tbl_storage_engine'] ??= null; + $GLOBALS['tbl_collation'] ??= null; + $GLOBALS['table_info_num_rows'] ??= null; $this->dbi->selectDb($GLOBALS['db']); $GLOBALS['reread_info'] = $this->tableObj->getStatusInfo(null, true); @@ -152,8 +152,8 @@ class StructureController extends AbstractController bool $isSystemSchema, string $route ) { - $GLOBALS['tbl_is_view'] = $GLOBALS['tbl_is_view'] ?? null; - $GLOBALS['tbl_storage_engine'] = $GLOBALS['tbl_storage_engine'] ?? null; + $GLOBALS['tbl_is_view'] ??= null; + $GLOBALS['tbl_storage_engine'] ??= null; // prepare comments $comments_map = []; @@ -283,10 +283,10 @@ class StructureController extends AbstractController */ protected function getTableStats(bool $isSystemSchema) { - $GLOBALS['tbl_is_view'] = $GLOBALS['tbl_is_view'] ?? null; - $GLOBALS['tbl_storage_engine'] = $GLOBALS['tbl_storage_engine'] ?? null; - $GLOBALS['table_info_num_rows'] = $GLOBALS['table_info_num_rows'] ?? null; - $GLOBALS['tbl_collation'] = $GLOBALS['tbl_collation'] ?? null; + $GLOBALS['tbl_is_view'] ??= null; + $GLOBALS['tbl_storage_engine'] ??= null; + $GLOBALS['table_info_num_rows'] ??= null; + $GLOBALS['tbl_collation'] ??= null; if (empty($GLOBALS['showtable'])) { $GLOBALS['showtable'] = $this->dbi->getTable($GLOBALS['db'], $GLOBALS['table'])->getStatusInfo(null, true); diff --git a/libraries/classes/Controllers/Table/TrackingController.php b/libraries/classes/Controllers/Table/TrackingController.php index e98e2e69a8..8d6d8ad148 100644 --- a/libraries/classes/Controllers/Table/TrackingController.php +++ b/libraries/classes/Controllers/Table/TrackingController.php @@ -44,12 +44,12 @@ final class TrackingController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['msg'] = $GLOBALS['msg'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; - $GLOBALS['entries'] = $GLOBALS['entries'] ?? null; - $GLOBALS['filter_users'] = $GLOBALS['filter_users'] ?? null; + $GLOBALS['text_dir'] ??= null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['msg'] ??= null; + $GLOBALS['errorUrl'] ??= null; + $GLOBALS['entries'] ??= null; + $GLOBALS['filter_users'] ??= null; $this->addScriptFiles(['vendor/jquery/jquery.tablesorter.js', 'table/tracking.js']); @@ -120,8 +120,8 @@ final class TrackingController extends AbstractController $GLOBALS['filter_users'] = array_map('trim', explode(',', $users)); } - $dateFrom = $dateFrom ?? new DateTimeImmutable(); - $dateTo = $dateTo ?? new DateTimeImmutable(); + $dateFrom ??= new DateTimeImmutable(); + $dateTo ??= new DateTimeImmutable(); // Prepare export if ($reportExport !== null) { diff --git a/libraries/classes/Controllers/Table/TriggersController.php b/libraries/classes/Controllers/Table/TriggersController.php index 202a0bf007..0a7f5f1031 100644 --- a/libraries/classes/Controllers/Table/TriggersController.php +++ b/libraries/classes/Controllers/Table/TriggersController.php @@ -39,9 +39,9 @@ class TriggersController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['errors'] = $GLOBALS['errors'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errors'] ??= null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; $this->addScriptFiles(['database/triggers.js']); diff --git a/libraries/classes/Controllers/Table/ZoomSearchController.php b/libraries/classes/Controllers/Table/ZoomSearchController.php index 3119acd1e4..b11ada1b10 100644 --- a/libraries/classes/Controllers/Table/ZoomSearchController.php +++ b/libraries/classes/Controllers/Table/ZoomSearchController.php @@ -93,9 +93,9 @@ class ZoomSearchController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['goto'] = $GLOBALS['goto'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['goto'] ??= null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['errorUrl'] ??= null; $this->checkParameters(['db', 'table']); $GLOBALS['urlParams'] = ['db' => $GLOBALS['db'], 'table' => $GLOBALS['table']]; diff --git a/libraries/classes/Controllers/UserPasswordController.php b/libraries/classes/Controllers/UserPasswordController.php index 23c7df1e6c..5c3df22fb9 100644 --- a/libraries/classes/Controllers/UserPasswordController.php +++ b/libraries/classes/Controllers/UserPasswordController.php @@ -36,10 +36,10 @@ class UserPasswordController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['hostname'] = $GLOBALS['hostname'] ?? null; - $GLOBALS['username'] = $GLOBALS['username'] ?? null; - $GLOBALS['change_password_message'] = $GLOBALS['change_password_message'] ?? null; - $GLOBALS['msg'] = $GLOBALS['msg'] ?? null; + $GLOBALS['hostname'] ??= null; + $GLOBALS['username'] ??= null; + $GLOBALS['change_password_message'] ??= null; + $GLOBALS['msg'] ??= null; $this->addScriptFiles(['server/privileges.js', 'vendor/zxcvbn-ts.js']); diff --git a/libraries/classes/Controllers/View/CreateController.php b/libraries/classes/Controllers/View/CreateController.php index 30e77674ec..6eab09695b 100644 --- a/libraries/classes/Controllers/View/CreateController.php +++ b/libraries/classes/Controllers/View/CreateController.php @@ -61,9 +61,9 @@ class CreateController extends AbstractController public function __invoke(ServerRequest $request): void { $this->checkParameters(['db']); - $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['text_dir'] ??= null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['message'] ??= null; $GLOBALS['errorUrl'] = Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabDatabase'], 'database'); $GLOBALS['errorUrl'] .= Url::getCommon(['db' => $GLOBALS['db']], '&'); diff --git a/libraries/classes/Controllers/View/OperationsController.php b/libraries/classes/Controllers/View/OperationsController.php index 2baadcc48a..18281625c1 100644 --- a/libraries/classes/Controllers/View/OperationsController.php +++ b/libraries/classes/Controllers/View/OperationsController.php @@ -41,13 +41,13 @@ class OperationsController extends AbstractController public function __invoke(ServerRequest $request): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; - $GLOBALS['reload'] = $GLOBALS['reload'] ?? null; - $GLOBALS['result'] = $GLOBALS['result'] ?? null; - $GLOBALS['warning_messages'] = $GLOBALS['warning_messages'] ?? null; + $GLOBALS['urlParams'] ??= null; + $GLOBALS['reload'] ??= null; + $GLOBALS['result'] ??= null; + $GLOBALS['warning_messages'] ??= null; $tableObject = $this->dbi->getTable($GLOBALS['db'], $GLOBALS['table']); - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; $this->addScriptFiles(['table/operations.js']); $this->checkParameters(['db', 'table']); diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index 02b7bf8470..9f6f048428 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -118,7 +118,7 @@ class Core bool $fatal = false, string $extra = '' ): void { - $GLOBALS['errorHandler'] = $GLOBALS['errorHandler'] ?? null; + $GLOBALS['errorHandler'] ??= null; $message = 'The %s extension is missing. Please check your PHP configuration.'; diff --git a/libraries/classes/Crypto/Crypto.php b/libraries/classes/Crypto/Crypto.php index 8be9895f81..98ae1cbe5f 100644 --- a/libraries/classes/Crypto/Crypto.php +++ b/libraries/classes/Crypto/Crypto.php @@ -20,7 +20,7 @@ final class Crypto { private function getEncryptionKey(): string { - $GLOBALS['config'] = $GLOBALS['config'] ?? null; + $GLOBALS['config'] ??= null; $key = $GLOBALS['config']->get('URLQueryEncryptionSecretKey'); if (is_string($key) && mb_strlen($key, '8bit') === SODIUM_CRYPTO_SECRETBOX_KEYBYTES) { diff --git a/libraries/classes/Database/Designer.php b/libraries/classes/Database/Designer.php index b44c8e3a7d..ea879b9cb9 100644 --- a/libraries/classes/Database/Designer.php +++ b/libraries/classes/Database/Designer.php @@ -247,7 +247,7 @@ class Designer array $tables_all_keys, array $tables_pk_or_unique_keys ) { - $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; + $GLOBALS['text_dir'] ??= null; $columns_type = []; foreach ($designerTables as $designerTable) { @@ -333,7 +333,7 @@ class Designer array $tablesAllKeys, array $tablesPkOrUniqueKeys ): string { - $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? null; + $GLOBALS['text_dir'] ??= null; $relationParameters = $this->relation->getRelationParameters(); $columnsType = []; diff --git a/libraries/classes/Database/Designer/Common.php b/libraries/classes/Database/Designer/Common.php index 6041ff68ba..489441a6db 100644 --- a/libraries/classes/Database/Designer/Common.php +++ b/libraries/classes/Database/Designer/Common.php @@ -57,7 +57,7 @@ class Common public function getTablesInfo(?string $db = null, ?string $table = null): array { $designerTables = []; - $db = $db ?? $GLOBALS['db']; + $db ??= $GLOBALS['db']; // seems to be needed later $this->dbi->selectDb($db); if ($table === null) { diff --git a/libraries/classes/Database/Events.php b/libraries/classes/Database/Events.php index 574d212bb4..90e7c7a8e4 100644 --- a/libraries/classes/Database/Events.php +++ b/libraries/classes/Database/Events.php @@ -86,8 +86,8 @@ class Events */ public function handleEditor(): void { - $GLOBALS['errors'] = $GLOBALS['errors'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['errors'] ??= null; + $GLOBALS['message'] ??= null; if (! empty($_POST['editor_process_add']) || ! empty($_POST['editor_process_edit'])) { $sql_query = ''; @@ -393,7 +393,7 @@ class Events */ public function getQueryFromRequest() { - $GLOBALS['errors'] = $GLOBALS['errors'] ?? null; + $GLOBALS['errors'] ??= null; $query = 'CREATE '; if (! empty($_POST['item_definer'])) { diff --git a/libraries/classes/Database/Routines.php b/libraries/classes/Database/Routines.php index 06816f4404..d66eed2cb8 100644 --- a/libraries/classes/Database/Routines.php +++ b/libraries/classes/Database/Routines.php @@ -81,7 +81,7 @@ class Routines */ public function handleEditor(): void { - $GLOBALS['errors'] = $GLOBALS['errors'] ?? null; + $GLOBALS['errors'] ??= null; $GLOBALS['errors'] = $this->handleRequestCreateOrEdit($GLOBALS['errors'], $GLOBALS['db']); /** @@ -181,7 +181,7 @@ class Routines */ public function handleRequestCreateOrEdit(array $errors, $db) { - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['message'] ??= null; if (empty($_POST['editor_process_add']) && empty($_POST['editor_process_edit'])) { return $errors; @@ -736,7 +736,7 @@ class Routines */ public function getEditorForm($mode, $operation, array $routine) { - $GLOBALS['errors'] = $GLOBALS['errors'] ?? null; + $GLOBALS['errors'] ??= null; for ($i = 0; $i < $routine['item_num_params']; $i++) { $routine['item_param_name'][$i] = htmlentities($routine['item_param_name'][$i], ENT_QUOTES); @@ -817,7 +817,7 @@ class Routines string $itemType, bool &$warnedAboutLength ): string { - $GLOBALS['errors'] = $GLOBALS['errors'] ?? null; + $GLOBALS['errors'] ??= null; $params = ''; $warnedAboutDir = false; @@ -904,7 +904,7 @@ class Routines string $query, bool $warnedAboutLength ): string { - $GLOBALS['errors'] = $GLOBALS['errors'] ?? null; + $GLOBALS['errors'] ??= null; $itemReturnType = $_POST['item_returntype'] ?? null; @@ -958,7 +958,7 @@ class Routines */ public function getQueryFromRequest(): string { - $GLOBALS['errors'] = $GLOBALS['errors'] ?? null; + $GLOBALS['errors'] ??= null; $itemType = $_POST['item_type'] ?? ''; $itemDefiner = $_POST['item_definer'] ?? ''; diff --git a/libraries/classes/Database/Triggers.php b/libraries/classes/Database/Triggers.php index eea058a1c3..e0d422305c 100644 --- a/libraries/classes/Database/Triggers.php +++ b/libraries/classes/Database/Triggers.php @@ -97,8 +97,8 @@ class Triggers */ public function handleEditor(): void { - $GLOBALS['errors'] = $GLOBALS['errors'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['errors'] ??= null; + $GLOBALS['message'] ??= null; if (! empty($_POST['editor_process_add']) || ! empty($_POST['editor_process_edit'])) { $sql_query = ''; @@ -373,7 +373,7 @@ class Triggers */ public function getQueryFromRequest() { - $GLOBALS['errors'] = $GLOBALS['errors'] ?? null; + $GLOBALS['errors'] ??= null; $query = 'CREATE '; if (! empty($_POST['item_definer'])) { diff --git a/libraries/classes/DbTableExists.php b/libraries/classes/DbTableExists.php index ad9e0f0387..d46add3bd4 100644 --- a/libraries/classes/DbTableExists.php +++ b/libraries/classes/DbTableExists.php @@ -22,8 +22,8 @@ final class DbTableExists private static function checkDatabase(string $db, bool $isTransformationWrapper): void { - $GLOBALS['message'] = $GLOBALS['message'] ?? null; - $GLOBALS['show_as_php'] = $GLOBALS['show_as_php'] ?? null; + $GLOBALS['message'] ??= null; + $GLOBALS['show_as_php'] ??= null; if (! empty($GLOBALS['is_db'])) { return; diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index 288a64bc6a..e45e115ef9 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -1247,7 +1247,7 @@ class Results */ private function getFullOrPartialTextButtonOrLink(): string { - $GLOBALS['theme'] = $GLOBALS['theme'] ?? null; + $GLOBALS['theme'] ??= null; $urlParamsFullText = [ 'db' => $this->properties['db'], @@ -1945,7 +1945,7 @@ class Results ) { // Mostly because of browser transformations, to make the row-data accessible in a plugin. - $GLOBALS['row'] = $GLOBALS['row'] ?? null; + $GLOBALS['row'] ??= null; $tableBodyHtml = ''; diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php index f7c3b6fa2f..fd0221411c 100644 --- a/libraries/classes/Export.php +++ b/libraries/classes/Export.php @@ -130,8 +130,8 @@ class Export */ public function outputHandler(string $line): bool { - $GLOBALS['time_start'] = $GLOBALS['time_start'] ?? null; - $GLOBALS['save_filename'] = $GLOBALS['save_filename'] ?? null; + $GLOBALS['time_start'] ??= null; + $GLOBALS['save_filename'] ??= null; // Kanji encoding convert feature if ($GLOBALS['output_kanji_conversion']) { @@ -1079,7 +1079,7 @@ class Export */ public function showPage(string $exportType): void { - $GLOBALS['active_page'] = $GLOBALS['active_page'] ?? null; + $GLOBALS['active_page'] ??= null; $request = Common::getRequest(); $container = Core::getContainerBuilder(); if ($exportType === 'server') { diff --git a/libraries/classes/Export/Options.php b/libraries/classes/Export/Options.php index cafb41a1bc..18a147462a 100644 --- a/libraries/classes/Export/Options.php +++ b/libraries/classes/Export/Options.php @@ -213,7 +213,7 @@ final class Options private function getFileNameTemplate(string $exportType, ?string $filename = null): string { - $GLOBALS['config'] = $GLOBALS['config'] ?? null; + $GLOBALS['config'] ??= null; if ($filename !== null) { return $filename; diff --git a/libraries/classes/Footer.php b/libraries/classes/Footer.php index aa06b53cf3..1c11048d4e 100644 --- a/libraries/classes/Footer.php +++ b/libraries/classes/Footer.php @@ -130,7 +130,7 @@ class Footer */ public function getSelfUrl(): string { - $GLOBALS['server'] = $GLOBALS['server'] ?? null; + $GLOBALS['server'] ??= null; $params = []; $params['route'] = Common::getRequest()->getRoute(); diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 99435809cb..e879b3dff5 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -260,7 +260,7 @@ class Header */ public function getDisplay(): string { - $GLOBALS['theme'] = $GLOBALS['theme'] ?? null; + $GLOBALS['theme'] ??= null; if ($this->headerIsSent || ! $this->isEnabled) { return ''; diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php index ad4eaec6e9..b1dbda465d 100644 --- a/libraries/classes/Import.php +++ b/libraries/classes/Import.php @@ -81,9 +81,9 @@ class Import */ public function checkTimeout(): bool { - $GLOBALS['timestamp'] = $GLOBALS['timestamp'] ?? null; - $GLOBALS['maximum_time'] = $GLOBALS['maximum_time'] ?? null; - $GLOBALS['timeout_passed'] = $GLOBALS['timeout_passed'] ?? null; + $GLOBALS['timestamp'] ??= null; + $GLOBALS['maximum_time'] ??= null; + $GLOBALS['timeout_passed'] ??= null; if ($GLOBALS['maximum_time'] == 0) { return false; @@ -113,11 +113,11 @@ class Import */ public function executeQuery(string $sql, array &$sqlData): void { - $GLOBALS['my_die'] = $GLOBALS['my_die'] ?? null; - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['reload'] = $GLOBALS['reload'] ?? null; - $GLOBALS['msg'] = $GLOBALS['msg'] ?? null; - $GLOBALS['sql_query_disabled'] = $GLOBALS['sql_query_disabled'] ?? null; + $GLOBALS['my_die'] ??= null; + $GLOBALS['error'] ??= null; + $GLOBALS['reload'] ??= null; + $GLOBALS['msg'] ??= null; + $GLOBALS['sql_query_disabled'] ??= null; $GLOBALS['result'] = $GLOBALS['dbi']->tryQuery($sql); // USE query changes the database, son need to track @@ -186,15 +186,15 @@ class Import */ public function runQuery(string $sql, array &$sqlData): void { - $GLOBALS['go_sql'] = $GLOBALS['go_sql'] ?? null; - $GLOBALS['complete_query'] = $GLOBALS['complete_query'] ?? null; - $GLOBALS['display_query'] = $GLOBALS['display_query'] ?? null; - $GLOBALS['msg'] = $GLOBALS['msg'] ?? null; - $GLOBALS['skip_queries'] = $GLOBALS['skip_queries'] ?? null; - $GLOBALS['executed_queries'] = $GLOBALS['executed_queries'] ?? null; - $GLOBALS['max_sql_len'] = $GLOBALS['max_sql_len'] ?? null; - $GLOBALS['sql_query_disabled'] = $GLOBALS['sql_query_disabled'] ?? null; - $GLOBALS['run_query'] = $GLOBALS['run_query'] ?? null; + $GLOBALS['go_sql'] ??= null; + $GLOBALS['complete_query'] ??= null; + $GLOBALS['display_query'] ??= null; + $GLOBALS['msg'] ??= null; + $GLOBALS['skip_queries'] ??= null; + $GLOBALS['executed_queries'] ??= null; + $GLOBALS['max_sql_len'] ??= null; + $GLOBALS['sql_query_disabled'] ??= null; + $GLOBALS['run_query'] ??= null; $GLOBALS['read_multiply'] = 1; if ($this->importRunBuffer === null) { @@ -314,9 +314,9 @@ class Import */ public function getNextChunk(?File $importHandle = null, int $size = 32768): string|bool { - $GLOBALS['charset_conversion'] = $GLOBALS['charset_conversion'] ?? null; - $GLOBALS['charset_of_file'] = $GLOBALS['charset_of_file'] ?? null; - $GLOBALS['read_multiply'] = $GLOBALS['read_multiply'] ?? null; + $GLOBALS['charset_conversion'] ??= null; + $GLOBALS['charset_of_file'] ??= null; + $GLOBALS['read_multiply'] ??= null; // Add some progression while reading large amount of data if ($GLOBALS['read_multiply'] <= 8) { @@ -956,7 +956,7 @@ class Import ?array $options = null, array &$sqlData = [] ): void { - $GLOBALS['import_notice'] = $GLOBALS['import_notice'] ?? null; + $GLOBALS['import_notice'] ??= null; /* Needed to quell the beast that is Message */ $GLOBALS['import_notice'] = null; diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php index 2a1524bd8b..07392d7a53 100644 --- a/libraries/classes/Navigation/Navigation.php +++ b/libraries/classes/Navigation/Navigation.php @@ -285,7 +285,7 @@ class Navigation */ private function getLogoSource(): string { - $GLOBALS['theme'] = $GLOBALS['theme'] ?? null; + $GLOBALS['theme'] ??= null; if ($GLOBALS['theme'] instanceof Theme) { if (@file_exists($GLOBALS['theme']->getFsPath() . 'img/logo_left.png')) { diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php index 64847650a4..60fc37d370 100644 --- a/libraries/classes/Operations.php +++ b/libraries/classes/Operations.php @@ -656,7 +656,7 @@ class Operations $transactional, $tableCollation ) { - $GLOBALS['auto_increment'] = $GLOBALS['auto_increment'] ?? null; + $GLOBALS['auto_increment'] ??= null; $tableAlters = []; diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php index b42156dbeb..be955fbbed 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php +++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php @@ -66,7 +66,7 @@ class AuthenticationCookie extends AuthenticationPlugin */ public function showLoginForm(): bool { - $GLOBALS['conn_error'] = $GLOBALS['conn_error'] ?? null; + $GLOBALS['conn_error'] ??= null; $response = ResponseRenderer::getInstance(); @@ -228,7 +228,7 @@ class AuthenticationCookie extends AuthenticationPlugin */ public function readCredentials(): bool { - $GLOBALS['conn_error'] = $GLOBALS['conn_error'] ?? null; + $GLOBALS['conn_error'] ??= null; // Initialization /** @@ -581,7 +581,7 @@ class AuthenticationCookie extends AuthenticationPlugin */ public function showFailure($failure): void { - $GLOBALS['conn_error'] = $GLOBALS['conn_error'] ?? null; + $GLOBALS['conn_error'] ??= null; parent::showFailure($failure); @@ -684,7 +684,7 @@ class AuthenticationCookie extends AuthenticationPlugin */ public function logOut(): void { - $GLOBALS['config'] = $GLOBALS['config'] ?? null; + $GLOBALS['config'] ??= null; // -> delete password cookie(s) if ($GLOBALS['cfg']['LoginCookieDeleteAll']) { diff --git a/libraries/classes/Plugins/AuthenticationPlugin.php b/libraries/classes/Plugins/AuthenticationPlugin.php index 7a104972b7..b03730d638 100644 --- a/libraries/classes/Plugins/AuthenticationPlugin.php +++ b/libraries/classes/Plugins/AuthenticationPlugin.php @@ -108,7 +108,7 @@ abstract class AuthenticationPlugin */ public function logOut(): void { - $GLOBALS['config'] = $GLOBALS['config'] ?? null; + $GLOBALS['config'] ??= null; /* Obtain redirect URL (before doing logout) */ if (! empty($GLOBALS['cfg']['Server']['LogoutURL'])) { diff --git a/libraries/classes/Plugins/Export/ExportCsv.php b/libraries/classes/Plugins/Export/ExportCsv.php index af9066b73c..e79c8d0dbf 100644 --- a/libraries/classes/Plugins/Export/ExportCsv.php +++ b/libraries/classes/Plugins/Export/ExportCsv.php @@ -106,11 +106,11 @@ class ExportCsv extends ExportPlugin */ public function exportHeader(): bool { - $GLOBALS['what'] = $GLOBALS['what'] ?? null; - $GLOBALS['csv_terminated'] = $GLOBALS['csv_terminated'] ?? null; - $GLOBALS['csv_separator'] = $GLOBALS['csv_separator'] ?? null; - $GLOBALS['csv_enclosed'] = $GLOBALS['csv_enclosed'] ?? null; - $GLOBALS['csv_escaped'] = $GLOBALS['csv_escaped'] ?? null; + $GLOBALS['what'] ??= null; + $GLOBALS['csv_terminated'] ??= null; + $GLOBALS['csv_separator'] ??= null; + $GLOBALS['csv_enclosed'] ??= null; + $GLOBALS['csv_escaped'] ??= null; // Here we just prepare some values for export if ($GLOBALS['what'] === 'excel') { @@ -212,11 +212,11 @@ class ExportCsv extends ExportPlugin $sqlQuery, array $aliases = [] ): bool { - $GLOBALS['what'] = $GLOBALS['what'] ?? null; - $GLOBALS['csv_terminated'] = $GLOBALS['csv_terminated'] ?? null; - $GLOBALS['csv_separator'] = $GLOBALS['csv_separator'] ?? ''; - $GLOBALS['csv_enclosed'] = $GLOBALS['csv_enclosed'] ?? null; - $GLOBALS['csv_escaped'] = $GLOBALS['csv_escaped'] ?? null; + $GLOBALS['what'] ??= null; + $GLOBALS['csv_terminated'] ??= null; + $GLOBALS['csv_separator'] ??= ''; + $GLOBALS['csv_enclosed'] ??= null; + $GLOBALS['csv_escaped'] ??= null; $db_alias = $db; $table_alias = $table; diff --git a/libraries/classes/Plugins/Export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php index 184d99ccd3..14e53f53d1 100644 --- a/libraries/classes/Plugins/Export/ExportHtmlword.php +++ b/libraries/classes/Plugins/Export/ExportHtmlword.php @@ -101,7 +101,7 @@ class ExportHtmlword extends ExportPlugin */ public function exportHeader(): bool { - $GLOBALS['charset'] = $GLOBALS['charset'] ?? null; + $GLOBALS['charset'] ??= null; return $this->export->outputHandler( 'getTable($db, $table)->isMerge()) { diff --git a/libraries/classes/Plugins/Export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php index 3161ab60fc..6650d4390c 100644 --- a/libraries/classes/Plugins/Export/ExportTexytext.php +++ b/libraries/classes/Plugins/Export/ExportTexytext.php @@ -166,7 +166,7 @@ class ExportTexytext extends ExportPlugin $sqlQuery, array $aliases = [] ): bool { - $GLOBALS['what'] = $GLOBALS['what'] ?? null; + $GLOBALS['what'] ??= null; $db_alias = $db; $table_alias = $table; diff --git a/libraries/classes/Plugins/Export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php index 9fc9864253..9ecf22c3ed 100644 --- a/libraries/classes/Plugins/Export/ExportXml.php +++ b/libraries/classes/Plugins/Export/ExportXml.php @@ -61,7 +61,7 @@ class ExportXml extends ExportPlugin */ private function initSpecificVariables(): void { - $GLOBALS['tables'] = $GLOBALS['tables'] ?? null; + $GLOBALS['tables'] ??= null; $this->setTable($GLOBALS['table']); if (! is_array($GLOBALS['tables'])) { diff --git a/libraries/classes/Plugins/Export/Helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php index 704bc9e416..3270a733f8 100644 --- a/libraries/classes/Plugins/Export/Helpers/Pdf.php +++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php @@ -160,7 +160,7 @@ class Pdf extends PdfLib // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps public function Header(): void { - $GLOBALS['maxY'] = $GLOBALS['maxY'] ?? null; + $GLOBALS['maxY'] ??= null; // We don't want automatic page breaks while generating header // as this can lead to infinite recursion as auto generated page diff --git a/libraries/classes/Plugins/Import/ImportCsv.php b/libraries/classes/Plugins/Import/ImportCsv.php index d1a43fe911..db7b3a0411 100644 --- a/libraries/classes/Plugins/Import/ImportCsv.php +++ b/libraries/classes/Plugins/Import/ImportCsv.php @@ -158,20 +158,20 @@ class ImportCsv extends AbstractImportCsv */ public function doImport(?File $importHandle = null): array { - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; - $GLOBALS['csv_terminated'] = $GLOBALS['csv_terminated'] ?? null; - $GLOBALS['csv_enclosed'] = $GLOBALS['csv_enclosed'] ?? null; - $GLOBALS['csv_escaped'] = $GLOBALS['csv_escaped'] ?? null; - $GLOBALS['csv_new_line'] = $GLOBALS['csv_new_line'] ?? null; - $GLOBALS['csv_columns'] = $GLOBALS['csv_columns'] ?? null; - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['error'] ??= null; + $GLOBALS['message'] ??= null; + $GLOBALS['csv_terminated'] ??= null; + $GLOBALS['csv_enclosed'] ??= null; + $GLOBALS['csv_escaped'] ??= null; + $GLOBALS['csv_new_line'] ??= null; + $GLOBALS['csv_columns'] ??= null; + $GLOBALS['errorUrl'] ??= null; // $csv_replace and $csv_ignore should have been here, // but we use directly from $_POST - $GLOBALS['timeout_passed'] = $GLOBALS['timeout_passed'] ?? null; - $GLOBALS['finished'] = $GLOBALS['finished'] ?? null; + $GLOBALS['timeout_passed'] ??= null; + $GLOBALS['finished'] ??= null; $replacements = [ '\\n' => "\n", @@ -656,8 +656,8 @@ class ImportCsv extends AbstractImportCsv string $csvNewLine, string $errUrl ): array { - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['error'] ??= null; + $GLOBALS['message'] ??= null; $param_error = false; if (strlen($csvTerminated) === 0) { @@ -718,7 +718,7 @@ class ImportCsv extends AbstractImportCsv private function getTableNameFromImport(string $databaseName): string { - $GLOBALS['import_file_name'] = $GLOBALS['import_file_name'] ?? null; + $GLOBALS['import_file_name'] ??= null; $importFileName = basename($GLOBALS['import_file_name'], '.csv'); $importFileName = mb_strtolower($importFileName); @@ -783,8 +783,8 @@ class ImportCsv extends AbstractImportCsv ?string $table, ?string $csvColumns ): array { - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['error'] ??= null; + $GLOBALS['message'] ??= null; $requiredFields = 0; $sqlTemplate = ''; diff --git a/libraries/classes/Plugins/Import/ImportLdi.php b/libraries/classes/Plugins/Import/ImportLdi.php index fc8976222f..4920c3bb15 100644 --- a/libraries/classes/Plugins/Import/ImportLdi.php +++ b/libraries/classes/Plugins/Import/ImportLdi.php @@ -91,18 +91,18 @@ class ImportLdi extends AbstractImportCsv */ public function doImport(?File $importHandle = null): array { - $GLOBALS['finished'] = $GLOBALS['finished'] ?? null; - $GLOBALS['import_file'] = $GLOBALS['import_file'] ?? null; - $GLOBALS['charset_conversion'] = $GLOBALS['charset_conversion'] ?? null; - $GLOBALS['ldi_local_option'] = $GLOBALS['ldi_local_option'] ?? null; - $GLOBALS['ldi_replace'] = $GLOBALS['ldi_replace'] ?? null; - $GLOBALS['ldi_ignore'] = $GLOBALS['ldi_ignore'] ?? null; - $GLOBALS['ldi_terminated'] = $GLOBALS['ldi_terminated'] ?? null; - $GLOBALS['ldi_enclosed'] = $GLOBALS['ldi_enclosed'] ?? null; - $GLOBALS['ldi_escaped'] = $GLOBALS['ldi_escaped'] ?? null; - $GLOBALS['ldi_new_line'] = $GLOBALS['ldi_new_line'] ?? null; - $GLOBALS['skip_queries'] = $GLOBALS['skip_queries'] ?? null; - $GLOBALS['ldi_columns'] = $GLOBALS['ldi_columns'] ?? null; + $GLOBALS['finished'] ??= null; + $GLOBALS['import_file'] ??= null; + $GLOBALS['charset_conversion'] ??= null; + $GLOBALS['ldi_local_option'] ??= null; + $GLOBALS['ldi_replace'] ??= null; + $GLOBALS['ldi_ignore'] ??= null; + $GLOBALS['ldi_terminated'] ??= null; + $GLOBALS['ldi_enclosed'] ??= null; + $GLOBALS['ldi_escaped'] ??= null; + $GLOBALS['ldi_new_line'] ??= null; + $GLOBALS['skip_queries'] ??= null; + $GLOBALS['ldi_columns'] ??= null; $sqlStatements = []; $compression = ''; diff --git a/libraries/classes/Plugins/Import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php index 0e97f72b25..fcd3850f51 100644 --- a/libraries/classes/Plugins/Import/ImportMediawiki.php +++ b/libraries/classes/Plugins/Import/ImportMediawiki.php @@ -68,9 +68,9 @@ class ImportMediawiki extends ImportPlugin */ public function doImport(?File $importHandle = null): array { - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['timeout_passed'] = $GLOBALS['timeout_passed'] ?? null; - $GLOBALS['finished'] = $GLOBALS['finished'] ?? null; + $GLOBALS['error'] ??= null; + $GLOBALS['timeout_passed'] ??= null; + $GLOBALS['finished'] ??= null; $sqlStatements = []; diff --git a/libraries/classes/Plugins/Import/ImportOds.php b/libraries/classes/Plugins/Import/ImportOds.php index 3720e39f74..cfea5b95e5 100644 --- a/libraries/classes/Plugins/Import/ImportOds.php +++ b/libraries/classes/Plugins/Import/ImportOds.php @@ -101,9 +101,9 @@ class ImportOds extends ImportPlugin */ public function doImport(?File $importHandle = null): array { - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['timeout_passed'] = $GLOBALS['timeout_passed'] ?? null; - $GLOBALS['finished'] = $GLOBALS['finished'] ?? null; + $GLOBALS['error'] ??= null; + $GLOBALS['timeout_passed'] ??= null; + $GLOBALS['finished'] ??= null; $sqlStatements = []; $buffer = ''; diff --git a/libraries/classes/Plugins/Import/ImportShp.php b/libraries/classes/Plugins/Import/ImportShp.php index 784fac580f..86d754c0e4 100644 --- a/libraries/classes/Plugins/Import/ImportShp.php +++ b/libraries/classes/Plugins/Import/ImportShp.php @@ -79,10 +79,10 @@ class ImportShp extends ImportPlugin */ public function doImport(?File $importHandle = null): array { - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['import_file'] = $GLOBALS['import_file'] ?? null; - $GLOBALS['local_import_file'] = $GLOBALS['local_import_file'] ?? null; - $GLOBALS['message'] = $GLOBALS['message'] ?? null; + $GLOBALS['error'] ??= null; + $GLOBALS['import_file'] ??= null; + $GLOBALS['local_import_file'] ??= null; + $GLOBALS['message'] ??= null; $GLOBALS['finished'] = false; if ($importHandle === null || $this->zipExtension === null) { @@ -325,9 +325,9 @@ class ImportShp extends ImportPlugin */ public static function readFromBuffer($length) { - $GLOBALS['buffer'] = $GLOBALS['buffer'] ?? null; - $GLOBALS['eof'] = $GLOBALS['eof'] ?? null; - $GLOBALS['importHandle'] = $GLOBALS['importHandle'] ?? null; + $GLOBALS['buffer'] ??= null; + $GLOBALS['eof'] ??= null; + $GLOBALS['importHandle'] ??= null; $import = new Import(); diff --git a/libraries/classes/Plugins/Import/ImportSql.php b/libraries/classes/Plugins/Import/ImportSql.php index f8eac7d0d1..a70db69dfc 100644 --- a/libraries/classes/Plugins/Import/ImportSql.php +++ b/libraries/classes/Plugins/Import/ImportSql.php @@ -98,8 +98,8 @@ class ImportSql extends ImportPlugin */ public function doImport(?File $importHandle = null): array { - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['timeout_passed'] = $GLOBALS['timeout_passed'] ?? null; + $GLOBALS['error'] ??= null; + $GLOBALS['timeout_passed'] ??= null; // Handle compatibility options. $this->setSQLMode($GLOBALS['dbi'], $_REQUEST); diff --git a/libraries/classes/Plugins/Import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php index 20995b6fa3..48a94e62e4 100644 --- a/libraries/classes/Plugins/Import/ImportXml.php +++ b/libraries/classes/Plugins/Import/ImportXml.php @@ -58,9 +58,9 @@ class ImportXml extends ImportPlugin */ public function doImport(?File $importHandle = null): array { - $GLOBALS['error'] = $GLOBALS['error'] ?? null; - $GLOBALS['timeout_passed'] = $GLOBALS['timeout_passed'] ?? null; - $GLOBALS['finished'] = $GLOBALS['finished'] ?? null; + $GLOBALS['error'] ??= null; + $GLOBALS['timeout_passed'] ??= null; + $GLOBALS['finished'] ??= null; $buffer = ''; diff --git a/libraries/classes/Plugins/Import/ShapeFileImport.php b/libraries/classes/Plugins/Import/ShapeFileImport.php index 926d3b2a94..6bce5f84a9 100644 --- a/libraries/classes/Plugins/Import/ShapeFileImport.php +++ b/libraries/classes/Plugins/Import/ShapeFileImport.php @@ -30,7 +30,7 @@ class ShapeFileImport extends ShapeFile */ public function eofSHP(): bool { - $GLOBALS['eof'] = $GLOBALS['eof'] ?? null; + $GLOBALS['eof'] ??= null; return (bool) $GLOBALS['eof']; } diff --git a/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php index c0ebfa35d6..258a398d0c 100644 --- a/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php +++ b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php @@ -39,7 +39,7 @@ class UploadNoplugin implements UploadInterface */ public static function getUploadStatus($id) { - $GLOBALS['SESSION_KEY'] = $GLOBALS['SESSION_KEY'] ?? null; + $GLOBALS['SESSION_KEY'] ??= null; if (trim($id) == '') { return null; diff --git a/libraries/classes/Plugins/Import/Upload/UploadProgress.php b/libraries/classes/Plugins/Import/Upload/UploadProgress.php index 5369092043..5bd45697d3 100644 --- a/libraries/classes/Plugins/Import/Upload/UploadProgress.php +++ b/libraries/classes/Plugins/Import/Upload/UploadProgress.php @@ -40,7 +40,7 @@ class UploadProgress implements UploadInterface */ public static function getUploadStatus($id) { - $GLOBALS['SESSION_KEY'] = $GLOBALS['SESSION_KEY'] ?? null; + $GLOBALS['SESSION_KEY'] ??= null; if (trim($id) == '') { return null; diff --git a/libraries/classes/Plugins/Import/Upload/UploadSession.php b/libraries/classes/Plugins/Import/Upload/UploadSession.php index ec576b18e6..4a7cef3514 100644 --- a/libraries/classes/Plugins/Import/Upload/UploadSession.php +++ b/libraries/classes/Plugins/Import/Upload/UploadSession.php @@ -40,7 +40,7 @@ class UploadSession implements UploadInterface */ public static function getUploadStatus($id) { - $GLOBALS['SESSION_KEY'] = $GLOBALS['SESSION_KEY'] ?? null; + $GLOBALS['SESSION_KEY'] ??= null; if (trim($id) == '') { return null; diff --git a/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php index c9fc066068..56b4cb9c1b 100644 --- a/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php @@ -45,8 +45,8 @@ abstract class DownloadTransformationsPlugin extends TransformationsPlugin */ public function applyTransformation($buffer, array $options = [], ?FieldMetadata $meta = null) { - $GLOBALS['row'] = $GLOBALS['row'] ?? null; - $GLOBALS['fields_meta'] = $GLOBALS['fields_meta'] ?? null; + $GLOBALS['row'] ??= null; + $GLOBALS['fields_meta'] ??= null; if (isset($options[0]) && ! empty($options[0])) { $cn = $options[0]; // filename diff --git a/libraries/classes/Plugins/TwoFactorPlugin.php b/libraries/classes/Plugins/TwoFactorPlugin.php index 50a5f35321..3317859bf0 100644 --- a/libraries/classes/Plugins/TwoFactorPlugin.php +++ b/libraries/classes/Plugins/TwoFactorPlugin.php @@ -148,7 +148,7 @@ class TwoFactorPlugin */ public function getAppId($return_url) { - $GLOBALS['config'] = $GLOBALS['config'] ?? null; + $GLOBALS['config'] ??= null; $url = $GLOBALS['config']->get('PmaAbsoluteUri'); $parsed = []; diff --git a/libraries/classes/ReplicationInfo.php b/libraries/classes/ReplicationInfo.php index 991f7b7cfd..774e3c243a 100644 --- a/libraries/classes/ReplicationInfo.php +++ b/libraries/classes/ReplicationInfo.php @@ -79,7 +79,7 @@ final class ReplicationInfo public function load(?string $connection = null): void { - $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null; + $GLOBALS['urlParams'] ??= null; $this->setPrimaryStatus(); diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index c2c038318e..bf5836df6e 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -570,7 +570,7 @@ class Privileges */ public function setUserGroup($username, $userGroup): void { - $userGroup = $userGroup ?? ''; + $userGroup ??= ''; $configurableMenusFeature = $this->relation->getRelationParameters()->configurableMenusFeature; if ($configurableMenusFeature === null) { return; @@ -748,11 +748,11 @@ class Privileges ?string $user = null, ?string $host = null ): string { - $GLOBALS['pred_username'] = $GLOBALS['pred_username'] ?? null; - $GLOBALS['pred_hostname'] = $GLOBALS['pred_hostname'] ?? null; - $GLOBALS['username'] = $GLOBALS['username'] ?? null; - $GLOBALS['hostname'] = $GLOBALS['hostname'] ?? null; - $GLOBALS['new_username'] = $GLOBALS['new_username'] ?? null; + $GLOBALS['pred_username'] ??= null; + $GLOBALS['pred_hostname'] ??= null; + $GLOBALS['username'] ??= null; + $GLOBALS['hostname'] ??= null; + $GLOBALS['new_username'] ??= null; [$usernameLength, $hostnameLength] = $this->getUsernameAndHostnameLength(); @@ -1245,10 +1245,10 @@ class Privileges $privileges = []; foreach ($allPrivileges as $privilege) { $userHost = $privilege['User'] . '@' . $privilege['Host']; - $privileges[$userHost] = $privileges[$userHost] ?? []; + $privileges[$userHost] ??= []; $privileges[$userHost]['user'] = (string) $privilege['User']; $privileges[$userHost]['host'] = (string) $privilege['Host']; - $privileges[$userHost]['privileges'] = $privileges[$userHost]['privileges'] ?? []; + $privileges[$userHost]['privileges'] ??= []; $privileges[$userHost]['privileges'][] = $this->getSpecificPrivilege($privilege); } diff --git a/libraries/classes/Server/Status/Monitor.php b/libraries/classes/Server/Status/Monitor.php index 94d41a5f26..4d378b7168 100644 --- a/libraries/classes/Server/Status/Monitor.php +++ b/libraries/classes/Server/Status/Monitor.php @@ -506,7 +506,7 @@ class Monitor string $database, string $query ): array { - $GLOBALS['cached_affected_rows'] = $GLOBALS['cached_affected_rows'] ?? null; + $GLOBALS['cached_affected_rows'] ??= null; $return = []; diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index e7cd72334a..04cb3299fc 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -1356,7 +1356,7 @@ class Sql $sqlQuery, ?string $completeQuery ): string { - $GLOBALS['showtable'] = $GLOBALS['showtable'] ?? null; + $GLOBALS['showtable'] ??= null; // If we are retrieving the full value of a truncated field or the original // value of a transformed field, show it here diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index 28628c6dc6..517788fd85 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -929,7 +929,7 @@ class Table implements Stringable $mode, bool $addDropIfExists ): bool { - $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null; + $GLOBALS['errorUrl'] ??= null; $relation = new Relation($GLOBALS['dbi']); // Try moving the tables directly, using native `RENAME` statement. diff --git a/libraries/classes/Table/ColumnsDefinition.php b/libraries/classes/Table/ColumnsDefinition.php index 07143359f4..bb430e014a 100644 --- a/libraries/classes/Table/ColumnsDefinition.php +++ b/libraries/classes/Table/ColumnsDefinition.php @@ -65,9 +65,9 @@ final class ColumnsDefinition ?array $selected = null, $fields_meta = null ): array { - $GLOBALS['col_priv'] = $GLOBALS['col_priv'] ?? null; - $GLOBALS['is_reload_priv'] = $GLOBALS['is_reload_priv'] ?? null; - $GLOBALS['mime_map'] = $GLOBALS['mime_map'] ?? null; + $GLOBALS['col_priv'] ??= null; + $GLOBALS['is_reload_priv'] ??= null; + $GLOBALS['mime_map'] ??= null; $length_values_input_size = 8; $content_cells = []; diff --git a/libraries/classes/ThemeManager.php b/libraries/classes/ThemeManager.php index c05f335701..4fac41365b 100644 --- a/libraries/classes/ThemeManager.php +++ b/libraries/classes/ThemeManager.php @@ -178,7 +178,7 @@ class ThemeManager */ public function getThemeCookie(): string|false { - $GLOBALS['config'] = $GLOBALS['config'] ?? null; + $GLOBALS['config'] ??= null; $name = $this->getThemeCookieName(); if ($GLOBALS['config']->issetCookie($name)) { diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php index 5f4f0db63c..ba1e6178ac 100644 --- a/libraries/classes/Tracker.php +++ b/libraries/classes/Tracker.php @@ -184,8 +184,8 @@ class Tracker $trackingSet = '', bool $isView = false ): bool { - $GLOBALS['sql_backquotes'] = $GLOBALS['sql_backquotes'] ?? null; - $GLOBALS['export_type'] = $GLOBALS['export_type'] ?? null; + $GLOBALS['sql_backquotes'] ??= null; + $GLOBALS['export_type'] ??= null; $relation = new Relation($GLOBALS['dbi']); if ($trackingSet == '') { diff --git a/libraries/classes/Twig/AssetExtension.php b/libraries/classes/Twig/AssetExtension.php index 792f7e9635..ae8a26b873 100644 --- a/libraries/classes/Twig/AssetExtension.php +++ b/libraries/classes/Twig/AssetExtension.php @@ -22,7 +22,7 @@ final class AssetExtension extends AbstractExtension public function getImagePath(?string $filename = null, ?string $fallback = null): string { - $GLOBALS['theme'] = $GLOBALS['theme'] ?? null; + $GLOBALS['theme'] ??= null; if (! $GLOBALS['theme'] instanceof Theme) { return ''; diff --git a/libraries/classes/Url.php b/libraries/classes/Url.php index 7edafc61a4..fb08f3bb8e 100644 --- a/libraries/classes/Url.php +++ b/libraries/classes/Url.php @@ -47,7 +47,7 @@ class Url $indent = 0, $skip = [] ) { - $GLOBALS['config'] = $GLOBALS['config'] ?? null; + $GLOBALS['config'] ??= null; if (is_array($db)) { $params =& $db; @@ -211,7 +211,7 @@ class Url */ public static function getCommonRaw(array $params = [], $divider = '?', $encrypt = true) { - $GLOBALS['config'] = $GLOBALS['config'] ?? null; + $GLOBALS['config'] ??= null; // avoid overwriting when creating navigation panel links to servers if ( @@ -247,7 +247,7 @@ class Url */ public static function buildHttpQuery($params, $encrypt = true) { - $GLOBALS['config'] = $GLOBALS['config'] ?? null; + $GLOBALS['config'] ??= null; $separator = self::getArgSeparator(); diff --git a/libraries/classes/Utils/SessionCache.php b/libraries/classes/Utils/SessionCache.php index 4a408f2a97..1fae79b179 100644 --- a/libraries/classes/Utils/SessionCache.php +++ b/libraries/classes/Utils/SessionCache.php @@ -8,7 +8,7 @@ final class SessionCache { private static function key(): string { - $GLOBALS['server'] = $GLOBALS['server'] ?? null; + $GLOBALS['server'] ??= null; $key = 'server_' . $GLOBALS['server']; if (isset($GLOBALS['cfg']['Server']['user'])) { diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 5a46ff086f..2e93181101 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -48,9 +48,6 @@ 4 - - 4 - 4 diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 32cd675c60..d6ea004206 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -7951,7 +7951,7 @@ parameters: path: libraries/classes/Server/Privileges.php - - message: "#^Variable \\$userGroup on left side of \\?\\? always exists and is not nullable\\.$#" + message: "#^Variable \\$userGroup on left side of \\?\\?\\= always exists and is not nullable\\.$#" count: 1 path: libraries/classes/Server/Privileges.php diff --git a/test/classes/Stubs/ResponseRenderer.php b/test/classes/Stubs/ResponseRenderer.php index 3703ba705c..9239864c29 100644 --- a/test/classes/Stubs/ResponseRenderer.php +++ b/test/classes/Stubs/ResponseRenderer.php @@ -49,9 +49,9 @@ class ResponseRenderer extends \PhpMyAdmin\ResponseRenderer $this->isDisabled = false; $GLOBALS['lang'] = 'en'; - $GLOBALS['server'] = $GLOBALS['server'] ?? 1; - $GLOBALS['text_dir'] = $GLOBALS['text_dir'] ?? 'ltr'; - $GLOBALS['PMA_PHP_SELF'] = $GLOBALS['PMA_PHP_SELF'] ?? 'index.php'; + $GLOBALS['server'] ??= 1; + $GLOBALS['text_dir'] ??= 'ltr'; + $GLOBALS['PMA_PHP_SELF'] ??= 'index.php'; $this->header = new Header(); $this->footer = new Footer(); }