diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 52a4c79804..69172b86bf 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -2025,15 +2025,6 @@ parameters: count: 1 path: src/Controllers/Database/DesignerController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Database/DesignerController.php - - message: '#^Cannot access offset ''dbName'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible @@ -2124,15 +2115,6 @@ parameters: count: 1 path: src/Controllers/Database/DesignerController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Database/EventsController.php - - message: '#^Cannot call method isSuccess\(\) on mixed\.$#' identifier: method.nonObject @@ -2187,15 +2169,6 @@ parameters: count: 1 path: src/Controllers/Database/EventsController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Database/ExportController.php - - message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#' identifier: empty.notAllowed @@ -2406,15 +2379,6 @@ parameters: count: 1 path: src/Controllers/Database/SearchController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Database/SqlController.php - - message: '#^Parameter \#1 \$database of method PhpMyAdmin\\Database\\CentralColumns\:\:deleteColumnsFromList\(\) expects string, mixed given\.$#' identifier: argument.type @@ -2544,15 +2508,6 @@ parameters: count: 1 path: src/Controllers/Database/Structure/FavoriteTableController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Database/Structure/RealRowCountController.php - - message: '#^Cannot cast mixed to string\.$#' identifier: cast.string @@ -2931,24 +2886,12 @@ parameters: count: 1 path: src/Controllers/Export/ExportController.php - - - message: '#^Parameter \#3 \$errorUrl of static method PhpMyAdmin\\Export\\Export\:\:exportRaw\(\) expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Export/ExportController.php - - message: '#^Parameter \#3 \$saveFilename of method PhpMyAdmin\\Export\\Export\:\:closeFile\(\) expects string, mixed given\.$#' identifier: argument.type count: 1 path: src/Controllers/Export/ExportController.php - - - message: '#^Parameter \#4 \$errorUrl of method PhpMyAdmin\\Export\\Export\:\:exportServer\(\) expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Export/ExportController.php - - message: '#^Parameter \#4 \$tableStructure of method PhpMyAdmin\\Export\\Export\:\:exportDatabase\(\) expects array\, array\ given\.$#' identifier: argument.type @@ -2956,7 +2899,7 @@ parameters: path: src/Controllers/Export/ExportController.php - - message: '#^Parameter \#5 \$errorUrl of method PhpMyAdmin\\Export\\Export\:\:exportTable\(\) expects string, mixed given\.$#' + message: '#^Parameter \#5 \$exportType of method PhpMyAdmin\\Export\\Export\:\:exportTable\(\) expects string, mixed given\.$#' identifier: argument.type count: 2 path: src/Controllers/Export/ExportController.php @@ -2968,19 +2911,7 @@ parameters: path: src/Controllers/Export/ExportController.php - - message: '#^Parameter \#6 \$exportType of method PhpMyAdmin\\Export\\Export\:\:exportTable\(\) expects string, mixed given\.$#' - identifier: argument.type - count: 2 - path: src/Controllers/Export/ExportController.php - - - - message: '#^Parameter \#7 \$errorUrl of method PhpMyAdmin\\Export\\Export\:\:exportDatabase\(\) expects string, mixed given\.$#' - identifier: argument.type - count: 2 - path: src/Controllers/Export/ExportController.php - - - - message: '#^Parameter \#8 \$exportType of method PhpMyAdmin\\Export\\Export\:\:exportDatabase\(\) expects string, mixed given\.$#' + message: '#^Parameter \#7 \$exportType of method PhpMyAdmin\\Export\\Export\:\:exportDatabase\(\) expects string, mixed given\.$#' identifier: argument.type count: 2 path: src/Controllers/Export/ExportController.php @@ -3357,15 +3288,6 @@ parameters: count: 1 path: src/Controllers/Normalization/ThirdNormalForm/NewTablesController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Operations/Database/CollationController.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: @@ -3462,15 +3384,6 @@ parameters: count: 1 path: src/Controllers/Operations/TableController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Operations/ViewController.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: @@ -3813,12 +3726,6 @@ parameters: count: 1 path: src/Controllers/Server/PrivilegesController.php - - - message: '#^Parameter \#1 \$errorUrl of method PhpMyAdmin\\Server\\Privileges\:\:updatePassword\(\) expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Server/PrivilegesController.php - - message: '#^Parameter \#1 \$message of static method PhpMyAdmin\\Html\\Generator\:\:getMessage\(\) expects PhpMyAdmin\\Message\|string, mixed given\.$#' identifier: argument.type @@ -4296,12 +4203,6 @@ parameters: count: 1 path: src/Controllers/Sql/SqlController.php - - - message: '#^Parameter \#4 \$backUrl of static method PhpMyAdmin\\Html\\Generator\:\:mysqlDie\(\) expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Sql/SqlController.php - - message: '#^Parameter \#5 \$sqlQueryForBookmark of method PhpMyAdmin\\Sql\:\:executeQueryAndSendQueryResponse\(\) expects string\|null, mixed given\.$#' identifier: argument.type @@ -4452,12 +4353,6 @@ parameters: count: 1 path: src/Controllers/Table/ChangeController.php - - - message: '#^Parameter \#4 \$errorUrl of method PhpMyAdmin\\InsertEdit\:\:getContinueInsertionForm\(\) expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Table/ChangeController.php - - message: '#^Parameter \#7 \$isUpload of method PhpMyAdmin\\InsertEdit\:\:getHtmlForInsertEditRow\(\) expects bool, mixed given\.$#' identifier: argument.type @@ -4488,7 +4383,7 @@ parameters: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated - count: 2 + count: 1 path: src/Controllers/Table/ChartController.php - @@ -4557,15 +4452,6 @@ parameters: count: 1 path: src/Controllers/Table/CreateController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Table/DeleteConfirmController.php - - message: '#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\.$#' identifier: foreach.nonIterable @@ -4647,15 +4533,6 @@ parameters: count: 1 path: src/Controllers/Table/DropColumnController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Table/ExportController.php - - message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#' identifier: empty.notAllowed @@ -4686,7 +4563,7 @@ parameters: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated - count: 2 + count: 1 path: src/Controllers/Table/FindReplaceController.php - @@ -4737,7 +4614,7 @@ parameters: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated - count: 3 + count: 2 path: src/Controllers/Table/GisVisualizationController.php - @@ -4797,15 +4674,6 @@ parameters: count: 1 path: src/Controllers/Table/ImportController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Table/IndexRenameController.php - - message: '#^Binary operation "\+\=" between int and mixed results in an error\.$#' identifier: assignOp.invalid @@ -4818,7 +4686,7 @@ parameters: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated - count: 2 + count: 1 path: src/Controllers/Table/IndexesController.php - @@ -5259,7 +5127,7 @@ parameters: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated - count: 4 + count: 3 path: src/Controllers/Table/SearchController.php - @@ -5328,15 +5196,6 @@ parameters: count: 1 path: src/Controllers/Table/SearchController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Table/SqlController.php - - message: '#^Parameter \#3 \$query of method PhpMyAdmin\\SqlQueryForm\:\:getHtml\(\) expects bool\|string, mixed given\.$#' identifier: argument.type @@ -5433,15 +5292,6 @@ parameters: count: 2 path: src/Controllers/Table/Structure/PartitioningController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Table/Structure/PrimaryController.php - - message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#' identifier: empty.notAllowed @@ -5742,7 +5592,7 @@ parameters: Use dependency injection instead\.$# ''' identifier: staticMethod.deprecated - count: 3 + count: 2 path: src/Controllers/Table/StructureController.php - @@ -5775,15 +5625,6 @@ parameters: count: 4 path: src/Controllers/Table/StructureController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Table/TrackingController.php - - message: '#^Parameter \#2 \$entries of method PhpMyAdmin\\Tracking\\Tracking\:\:getDownloadInfoForExport\(\) expects array\\>, array\ given\.$#' identifier: argument.type @@ -5970,15 +5811,6 @@ parameters: count: 1 path: src/Controllers/Transformation/WrapperController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/Triggers/IndexController.php - - message: '#^Cannot call method isSuccess\(\) on mixed\.$#' identifier: method.nonObject @@ -6066,15 +5898,6 @@ parameters: count: 1 path: src/Controllers/View/CreateController.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/Controllers/View/CreateController.php - - message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#' identifier: empty.notAllowed diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 4661441ba9..f7a7ee03f8 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -848,12 +848,6 @@ - - - - - - @@ -862,9 +856,6 @@ getQueryParam('db')]]> - - Current::$database]]]> - @@ -872,7 +863,6 @@ - @@ -893,11 +883,7 @@ - - - - @@ -906,11 +892,7 @@ - - Current::$database]]]> - - @@ -958,11 +940,7 @@ - - - - @@ -972,11 +950,7 @@ - - Current::$database]]]> - - @@ -997,18 +971,11 @@ - - - - - Current::$database]]]> - - @@ -1053,7 +1020,6 @@ - @@ -1068,9 +1034,6 @@ - - Current::$database]]]> - @@ -1100,7 +1063,6 @@ - @@ -1194,18 +1156,12 @@ - - - Current::$database]]]> - - - @@ -1219,21 +1175,9 @@ - - - - - - - - Current::$database]]]> - - - - @@ -1327,16 +1271,10 @@ - - - - - Current::$database]]]> - @@ -1347,7 +1285,6 @@ - @@ -1357,22 +1294,10 @@ - - - - - - - - Current::$database]]]> - - - - @@ -1401,9 +1326,6 @@ - - - @@ -1429,9 +1351,6 @@ - - Current::$database]]]> - @@ -1440,7 +1359,6 @@ - @@ -1480,19 +1398,10 @@ - - - getParsedBodyParam('selected')]]> - - Current::$database]]]> - - - - @@ -1531,7 +1440,6 @@ - @@ -1544,12 +1452,6 @@ - - - - - - @@ -1581,7 +1483,6 @@ - @@ -1685,12 +1586,6 @@ - - - - - - @@ -1705,12 +1600,6 @@ - - - - - - @@ -1802,7 +1691,6 @@ - @@ -1821,7 +1709,6 @@ settings['Servers'][Current::$server]]]> - @@ -1852,7 +1739,6 @@ - @@ -1867,7 +1753,6 @@ - @@ -2051,21 +1936,9 @@ - - - - - - - - Current::$database]]]> - - - - @@ -2083,7 +1956,6 @@ - @@ -2091,11 +1963,7 @@ - - Current::$database]]]> - - @@ -2117,7 +1985,6 @@ - @@ -2125,7 +1992,6 @@ - @@ -2140,14 +2006,7 @@ - - - - - - - @@ -2328,14 +2187,12 @@ - - @@ -2348,9 +2205,6 @@ - - - @@ -2384,7 +2238,6 @@ - @@ -2428,15 +2281,11 @@ - - - - @@ -2466,9 +2315,6 @@ - - - getQueryParam('initial')]]> @@ -2477,9 +2323,6 @@ - - - @@ -2490,14 +2333,10 @@ - - - - @@ -2515,12 +2354,6 @@ - - - - - - @@ -2531,56 +2364,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2677,9 +2480,6 @@ - - - @@ -2688,7 +2488,6 @@ - @@ -2824,16 +2623,13 @@ - - getQueryParam('sql_signature')]]> - @@ -2842,20 +2638,13 @@ - - - - - - - @@ -2863,12 +2652,6 @@ - - - - - - @@ -2900,7 +2683,6 @@ - @@ -2921,7 +2703,6 @@ - @@ -2955,24 +2736,11 @@ - - - - - - - - - - - - - Current::$database, 'table' => Current::$table]]]> @@ -3035,18 +2803,6 @@ - - - - - - - - - - - - Current::$database, 'table' => Current::$table]]]> @@ -3116,11 +2872,7 @@ - - - - @@ -3134,10 +2886,8 @@ - - @@ -3170,11 +2920,7 @@ - - - - @@ -3185,9 +2931,6 @@ columnTypes[$i]]]> - - - @@ -3200,7 +2943,6 @@ - @@ -3231,11 +2973,7 @@ - - - Current::$database]]]> - @@ -3255,18 +2993,11 @@ - - - - - - - @@ -3286,18 +3017,6 @@ - - - - - - - - - - - - Current::$database, 'table' => Current::$table]]]> @@ -3308,20 +3027,12 @@ - - - - - - - - @@ -3487,7 +3198,6 @@ - @@ -3531,7 +3241,6 @@ - @@ -3582,14 +3291,10 @@ - foreignField]]> - - - @@ -3614,23 +3319,11 @@ - - - - - - getQueryParam('sql_query', true)]]> - - - - - - @@ -3696,18 +3389,6 @@ - - - - - - - - - - - - Current::$database, 'table' => Current::$table]]]> @@ -3841,19 +3522,11 @@ - - - - - - - - @@ -3886,12 +3559,6 @@ - - - - - - @@ -3905,14 +3572,12 @@ - - @@ -3936,7 +3601,6 @@ - @@ -3946,11 +3610,7 @@ - - - - @@ -4024,11 +3684,7 @@ - - - - @@ -4040,11 +3696,7 @@ - - Current::$database]]]> - - @@ -4109,9 +3761,6 @@ - - - @@ -4123,9 +3772,6 @@ - - Current::$database]]]> - @@ -8476,9 +8122,6 @@ - - - @@ -10783,11 +10426,7 @@ - - - - diff --git a/src/Controllers/Database/DesignerController.php b/src/Controllers/Database/DesignerController.php index e989359e2e..d7e2f3ef5b 100644 --- a/src/Controllers/Database/DesignerController.php +++ b/src/Controllers/Database/DesignerController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; -use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Designer; @@ -17,7 +16,6 @@ use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; use function __; use function htmlspecialchars; @@ -39,7 +37,6 @@ final class DesignerController implements InvocableController public function __invoke(ServerRequest $request): Response { $GLOBALS['message'] ??= null; - $GLOBALS['errorUrl'] ??= null; $db = $request->getParsedBodyParamAsStringOrNull('db'); $table = $request->getParsedBodyParamAsStringOrNull('table'); @@ -164,12 +161,6 @@ final class DesignerController implements InvocableController return $this->response->missingParameterError('db'); } - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabDatabase'], - 'database', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); - $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { if ($request->isAjax()) { diff --git a/src/Controllers/Database/EventsController.php b/src/Controllers/Database/EventsController.php index 33902bd635..2fc25e9f4d 100644 --- a/src/Controllers/Database/EventsController.php +++ b/src/Controllers/Database/EventsController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; -use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\Database\Events; @@ -16,7 +15,6 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; use PhpMyAdmin\Util; use function __; @@ -40,7 +38,6 @@ final class EventsController implements InvocableController public function __invoke(ServerRequest $request): Response { $GLOBALS['errors'] ??= null; - $GLOBALS['errorUrl'] ??= null; $this->response->addScriptFiles(['database/events.js', 'sql.js']); @@ -49,12 +46,6 @@ final class EventsController implements InvocableController return $this->response->missingParameterError('db'); } - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabDatabase'], - 'database', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); - $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { $this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No databases selected.')]); diff --git a/src/Controllers/Database/ExportController.php b/src/Controllers/Database/ExportController.php index 446e28526f..48bd8d1671 100644 --- a/src/Controllers/Database/ExportController.php +++ b/src/Controllers/Database/ExportController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; -use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; @@ -19,7 +18,6 @@ use PhpMyAdmin\Plugins; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; -use PhpMyAdmin\Util; use function __; use function array_merge; @@ -41,7 +39,6 @@ final class ExportController implements InvocableController { $GLOBALS['table_select'] ??= null; $GLOBALS['unlim_num_rows'] ??= null; - $GLOBALS['errorUrl'] ??= null; $this->pageSettings->init('Export'); $pageSettingsErrorHtml = $this->pageSettings->getErrorHTML(); @@ -53,12 +50,6 @@ final class ExportController implements InvocableController return $this->response->missingParameterError('db'); } - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabDatabase'], - 'database', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); - $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { if ($request->isAjax()) { diff --git a/src/Controllers/Database/ImportController.php b/src/Controllers/Database/ImportController.php index d85859df8b..dd5b4b61cc 100644 --- a/src/Controllers/Database/ImportController.php +++ b/src/Controllers/Database/ImportController.php @@ -21,7 +21,6 @@ use PhpMyAdmin\Import\ImportSettings; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; @@ -41,7 +40,6 @@ final class ImportController implements InvocableController public function __invoke(ServerRequest $request): Response { $GLOBALS['SESSION_KEY'] ??= null; - $GLOBALS['errorUrl'] ??= null; $this->pageSettings->init('Import'); $pageSettingsErrorHtml = $this->pageSettings->getErrorHTML(); @@ -54,8 +52,6 @@ final class ImportController implements InvocableController } $config = Config::getInstance(); - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database'); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Database/RoutinesController.php b/src/Controllers/Database/RoutinesController.php index eb8eecedca..07b7c4a86b 100644 --- a/src/Controllers/Database/RoutinesController.php +++ b/src/Controllers/Database/RoutinesController.php @@ -18,7 +18,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; use PhpMyAdmin\UserPrivilegesFactory; use PhpMyAdmin\Util; @@ -51,7 +50,6 @@ final class RoutinesController implements InvocableController public function __invoke(ServerRequest $request): Response { $GLOBALS['errors'] ??= null; - $GLOBALS['errorUrl'] ??= null; $this->response->addScriptFiles(['database/routines.js', 'sql.js']); @@ -70,8 +68,6 @@ final class RoutinesController implements InvocableController */ if (Current::$table !== '' && in_array(Current::$table, $this->dbi->getTables(Current::$database), true)) { UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabTable'], 'table'); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { @@ -92,12 +88,6 @@ final class RoutinesController implements InvocableController } else { Current::$table = ''; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - $config->settings['DefaultTabDatabase'], - 'database', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); - $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { $this->response->redirectToRoute( diff --git a/src/Controllers/Database/SearchController.php b/src/Controllers/Database/SearchController.php index f690179cf0..b3b2b1c128 100644 --- a/src/Controllers/Database/SearchController.php +++ b/src/Controllers/Database/SearchController.php @@ -35,8 +35,6 @@ final class SearchController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $this->response->addScriptFiles(['database/search.js', 'sql.js', 'makegrid.js']); if (Current::$database === '') { @@ -44,8 +42,8 @@ final class SearchController implements InvocableController } $config = Config::getInstance(); - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database'); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); + $errorUrl = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database'); + $errorUrl .= Url::getCommon(['db' => Current::$database], '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { @@ -75,7 +73,7 @@ final class SearchController implements InvocableController $this->response->render('error/simple', [ 'error_message' => $errorMessage, - 'back_url' => $GLOBALS['errorUrl'], + 'back_url' => $errorUrl, ]); return $this->response->response(); diff --git a/src/Controllers/Database/SqlController.php b/src/Controllers/Database/SqlController.php index d833559a5a..7eed99ab13 100644 --- a/src/Controllers/Database/SqlController.php +++ b/src/Controllers/Database/SqlController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; -use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; @@ -17,7 +16,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlQueryForm; use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; -use PhpMyAdmin\Util; use function __; use function htmlspecialchars; @@ -37,8 +35,6 @@ class SqlController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $this->response->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']); $this->pageSettings->init('Sql'); @@ -49,12 +45,6 @@ class SqlController implements InvocableController return $this->response->missingParameterError('db'); } - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabDatabase'], - 'database', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); - $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { if ($request->isAjax()) { diff --git a/src/Controllers/Database/Structure/FavoriteTableController.php b/src/Controllers/Database/Structure/FavoriteTableController.php index ad19c7dc88..aaa3b0732e 100644 --- a/src/Controllers/Database/Structure/FavoriteTableController.php +++ b/src/Controllers/Database/Structure/FavoriteTableController.php @@ -19,8 +19,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; -use PhpMyAdmin\Util; use function __; use function count; @@ -41,15 +39,11 @@ final class FavoriteTableController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - if (Current::$database === '') { return $this->response->response(); } $config = Config::getInstance(); - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database'); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); if (! $request->isAjax()) { return $this->response->response(); diff --git a/src/Controllers/Database/Structure/RealRowCountController.php b/src/Controllers/Database/Structure/RealRowCountController.php index b764dfaf28..e95ca1c65a 100644 --- a/src/Controllers/Database/Structure/RealRowCountController.php +++ b/src/Controllers/Database/Structure/RealRowCountController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database\Structure; -use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; @@ -14,7 +13,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Url; use PhpMyAdmin\Util; use function __; @@ -33,8 +31,6 @@ final class RealRowCountController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $parameters = [ 'real_row_count_all' => $_REQUEST['real_row_count_all'] ?? null, 'table' => $_REQUEST['table'] ?? null, @@ -44,12 +40,6 @@ final class RealRowCountController implements InvocableController return $this->response->missingParameterError('db'); } - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabDatabase'], - 'database', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); - if (! $request->isAjax()) { return $this->response->response(); } diff --git a/src/Controllers/Database/StructureController.php b/src/Controllers/Database/StructureController.php index 172887413b..2303114b29 100644 --- a/src/Controllers/Database/StructureController.php +++ b/src/Controllers/Database/StructureController.php @@ -123,8 +123,6 @@ final class StructureController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $parameters = ['sort' => $_REQUEST['sort'] ?? null, 'sort_order' => $_REQUEST['sort_order'] ?? null]; if (Current::$database === '') { @@ -132,8 +130,6 @@ final class StructureController implements InvocableController } $config = Config::getInstance(); - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database'); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Database/TrackingController.php b/src/Controllers/Database/TrackingController.php index b424f3bde4..0f78d460c8 100644 --- a/src/Controllers/Database/TrackingController.php +++ b/src/Controllers/Database/TrackingController.php @@ -19,7 +19,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Tracking\Tracking; use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; -use PhpMyAdmin\Util; use function __; use function htmlspecialchars; @@ -40,8 +39,6 @@ final class TrackingController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $this->response->addScriptFiles(['vendor/jquery/jquery.tablesorter.js', 'database/tracking.js']); if (Current::$database === '') { @@ -49,8 +46,6 @@ final class TrackingController implements InvocableController } $config = Config::getInstance(); - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database'); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Export/ExportController.php b/src/Controllers/Export/ExportController.php index 20c3495362..e5cfa09d9d 100644 --- a/src/Controllers/Export/ExportController.php +++ b/src/Controllers/Export/ExportController.php @@ -26,7 +26,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sanitize; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\SelectStatement; -use PhpMyAdmin\Url; use PhpMyAdmin\Util; use Webmozart\Assert\Assert; @@ -52,7 +51,6 @@ final class ExportController implements InvocableController public function __invoke(ServerRequest $request): Response { $GLOBALS['export_type'] ??= null; - $GLOBALS['errorUrl'] ??= null; $GLOBALS['message'] ??= null; $GLOBALS['compression'] ??= null; $GLOBALS['asfile'] ??= null; @@ -141,7 +139,6 @@ final class ExportController implements InvocableController $GLOBALS['buffer_needed'] = false; $GLOBALS['save_filename'] = ''; $GLOBALS['file_handle'] = ''; - $GLOBALS['errorUrl'] = ''; $filename = ''; $separateFiles = ''; @@ -169,22 +166,24 @@ final class ExportController implements InvocableController $tableNames = []; // Generate error url and check for needed variables - if ($GLOBALS['export_type'] === 'server') { - $GLOBALS['errorUrl'] = Url::getFromRoute('/server/export'); - } elseif ($GLOBALS['export_type'] === 'database' && Current::$database !== '') { - $GLOBALS['errorUrl'] = Url::getFromRoute('/database/export', ['db' => Current::$database]); + if ($GLOBALS['export_type'] === 'database') { + if (Current::$database === '') { + return $this->response->missingParameterError('db'); + } + // Check if we have something to export $tableNames = $GLOBALS['table_select'] ?? []; Assert::isArray($tableNames); Assert::allString($tableNames); - } elseif ($GLOBALS['export_type'] === 'table' && Current::$database !== '' && Current::$table !== '') { - $GLOBALS['errorUrl'] = Url::getFromRoute('/table/export', [ - 'db' => Current::$database, - 'table' => Current::$table, - ]); - } elseif ($GLOBALS['export_type'] === 'raw') { - $GLOBALS['errorUrl'] = Url::getFromRoute('/server/export', ['sql_query' => Current::$sqlQuery]); - } else { + } elseif ($GLOBALS['export_type'] === 'table') { + if (Current::$database === '') { + return $this->response->missingParameterError('db'); + } + + if (Current::$table === '') { + return $this->response->missingParameterError('table'); + } + } elseif ($GLOBALS['export_type'] !== 'raw' && $GLOBALS['export_type'] !== 'server') { $this->response->setRequestStatus(false); $this->response->addHTML(Message::error(__('Bad parameters!'))->getDisplay()); @@ -362,7 +361,6 @@ final class ExportController implements InvocableController $dbSelect, $whatStrucOrData, $exportPlugin, - $GLOBALS['errorUrl'], $GLOBALS['export_type'], $doRelation, $doComments, @@ -395,7 +393,6 @@ final class ExportController implements InvocableController $tableStructure, $GLOBALS['table_data'], $exportPlugin, - $GLOBALS['errorUrl'], $GLOBALS['export_type'], $doRelation, $doComments, @@ -415,7 +412,6 @@ final class ExportController implements InvocableController $tableStructure, $GLOBALS['table_data'], $exportPlugin, - $GLOBALS['errorUrl'], $GLOBALS['export_type'], $doRelation, $doComments, @@ -426,13 +422,7 @@ final class ExportController implements InvocableController ); } } elseif ($GLOBALS['export_type'] === 'raw') { - Export::exportRaw( - $whatStrucOrData, - $exportPlugin, - $GLOBALS['errorUrl'], - Current::$database, - Current::$sqlQuery, - ); + Export::exportRaw($whatStrucOrData, $exportPlugin, Current::$database, Current::$sqlQuery); } else { // We export just one table @@ -448,7 +438,6 @@ final class ExportController implements InvocableController Current::$table, $whatStrucOrData, $exportPlugin, - $GLOBALS['errorUrl'], $GLOBALS['export_type'], $doRelation, $doComments, @@ -469,7 +458,6 @@ final class ExportController implements InvocableController Current::$table, $whatStrucOrData, $exportPlugin, - $GLOBALS['errorUrl'], $GLOBALS['export_type'], $doRelation, $doComments, diff --git a/src/Controllers/HomeController.php b/src/Controllers/HomeController.php index 5ddc724dc8..d42570425a 100644 --- a/src/Controllers/HomeController.php +++ b/src/Controllers/HomeController.php @@ -67,7 +67,6 @@ final class HomeController implements InvocableController $GLOBALS['message'] ??= null; $GLOBALS['show_query'] ??= null; - $GLOBALS['errorUrl'] ??= null; if ($request->isAjax() && ! empty($_REQUEST['access_time'])) { return $this->response->response(); @@ -81,7 +80,6 @@ final class HomeController implements InvocableController Current::$database = $request->getParsedBodyParamAsString('db', ''); Current::$table = ''; $GLOBALS['show_query'] = '1'; - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); if (Current::$server > 0 && $this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); diff --git a/src/Controllers/Import/ImportController.php b/src/Controllers/Import/ImportController.php index 2558e3e5d4..b446d0538c 100644 --- a/src/Controllers/Import/ImportController.php +++ b/src/Controllers/Import/ImportController.php @@ -65,7 +65,6 @@ final class ImportController implements InvocableController $GLOBALS['ajax_reload'] ??= null; $GLOBALS['import_text'] ??= null; $GLOBALS['message'] ??= null; - $GLOBALS['errorUrl'] ??= null; $GLOBALS['error'] ??= null; $GLOBALS['result'] ??= null; diff --git a/src/Controllers/Operations/Database/CollationController.php b/src/Controllers/Operations/Database/CollationController.php index 0849e9b63c..c490d6ddcd 100644 --- a/src/Controllers/Operations/Database/CollationController.php +++ b/src/Controllers/Operations/Database/CollationController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Operations\Database; -use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; @@ -15,7 +14,6 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\Operations; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Url; use PhpMyAdmin\Util; use function __; @@ -32,8 +30,6 @@ final class CollationController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - if (! $request->isAjax()) { return $this->response->response(); } @@ -50,12 +46,6 @@ final class CollationController implements InvocableController return $this->response->missingParameterError('db'); } - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabDatabase'], - 'database', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); - $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { $this->response->setRequestStatus(false); diff --git a/src/Controllers/Operations/DatabaseController.php b/src/Controllers/Operations/DatabaseController.php index 7059c65db5..f245a30857 100644 --- a/src/Controllers/Operations/DatabaseController.php +++ b/src/Controllers/Operations/DatabaseController.php @@ -50,7 +50,6 @@ final class DatabaseController implements InvocableController public function __invoke(ServerRequest $request): Response { $GLOBALS['message'] ??= null; - $GLOBALS['errorUrl'] ??= null; $GLOBALS['single_table'] ??= null; $userPrivileges = $this->userPrivilegesFactory->getPrivileges(); @@ -230,8 +229,6 @@ final class DatabaseController implements InvocableController } $config = Config::getInstance(); - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database'); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Operations/TableController.php b/src/Controllers/Operations/TableController.php index f77a3cb81a..3d80851692 100644 --- a/src/Controllers/Operations/TableController.php +++ b/src/Controllers/Operations/TableController.php @@ -57,7 +57,6 @@ final class TableController implements InvocableController { $GLOBALS['auto_increment'] ??= null; $GLOBALS['message_to_show'] ??= null; - $GLOBALS['errorUrl'] ??= null; $userPrivileges = $this->userPrivilegesFactory->getPrivileges(); @@ -80,8 +79,6 @@ final class TableController implements InvocableController $isSystemSchema = Utilities::isSystemSchema(Current::$database); UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; $config = Config::getInstance(); - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabTable'], 'table'); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Operations/ViewController.php b/src/Controllers/Operations/ViewController.php index cde8a442fa..478fc2645b 100644 --- a/src/Controllers/Operations/ViewController.php +++ b/src/Controllers/Operations/ViewController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Operations; -use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; @@ -19,7 +18,6 @@ use PhpMyAdmin\MessageType; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; -use PhpMyAdmin\Util; use function __; use function array_map; @@ -42,7 +40,6 @@ final class ViewController implements InvocableController { $tableObject = $this->dbi->getTable(Current::$database, Current::$table); - $GLOBALS['errorUrl'] ??= null; $this->response->addScriptFiles(['table/operations.js']); if (Current::$database === '') { @@ -54,11 +51,6 @@ final class ViewController implements InvocableController } UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabTable'], - 'table', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Server/BinlogController.php b/src/Controllers/Server/BinlogController.php index ccb315796d..2e02f196b2 100644 --- a/src/Controllers/Server/BinlogController.php +++ b/src/Controllers/Server/BinlogController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Url; use PhpMyAdmin\Util; use function array_key_exists; @@ -39,8 +38,6 @@ final class BinlogController implements InvocableController $log = $request->getParsedBodyParamAsString('log'); $position = (int) $request->getParsedBodyParamAsString('pos', ''); - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Server/CollationsController.php b/src/Controllers/Server/CollationsController.php index 701cbc77ca..9d31e62cef 100644 --- a/src/Controllers/Server/CollationsController.php +++ b/src/Controllers/Server/CollationsController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Url; /** * Handles viewing character sets and collations @@ -43,8 +42,6 @@ final class CollationsController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Server/Databases/DestroyController.php b/src/Controllers/Server/Databases/DestroyController.php index 00c24f1b24..a42e04d753 100644 --- a/src/Controllers/Server/Databases/DestroyController.php +++ b/src/Controllers/Server/Databases/DestroyController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Transformations; -use PhpMyAdmin\Url; use PhpMyAdmin\UserPrivilegesFactory; use PhpMyAdmin\Util; @@ -36,7 +35,6 @@ final class DestroyController implements InvocableController public function __invoke(ServerRequest $request): Response { $GLOBALS['selected'] ??= null; - $GLOBALS['errorUrl'] ??= null; $userPrivileges = $this->userPrivilegesFactory->getPrivileges(); @@ -66,7 +64,6 @@ final class DestroyController implements InvocableController return $this->response->response(); } - $GLOBALS['errorUrl'] = Url::getFromRoute('/server/databases'); $GLOBALS['selected'] = $selectedDbs; $numberOfDatabases = count($selectedDbs); diff --git a/src/Controllers/Server/DatabasesController.php b/src/Controllers/Server/DatabasesController.php index 3156fc83ab..29caee50c4 100644 --- a/src/Controllers/Server/DatabasesController.php +++ b/src/Controllers/Server/DatabasesController.php @@ -67,8 +67,6 @@ final class DatabasesController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $userPrivileges = $this->userPrivilegesFactory->getPrivileges(); $this->hasStatistics = ! empty($request->getParam('statistics')); @@ -83,7 +81,6 @@ final class DatabasesController implements InvocableController $this->sortOrder = strtolower($sortOrder) !== 'desc' ? 'asc' : 'desc'; $this->response->addScriptFiles(['server/databases.js']); - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); diff --git a/src/Controllers/Server/EnginesController.php b/src/Controllers/Server/EnginesController.php index d2269fbb2a..7550e3f36f 100644 --- a/src/Controllers/Server/EnginesController.php +++ b/src/Controllers/Server/EnginesController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\StorageEngine; -use PhpMyAdmin\Url; /** * Handles viewing storage engine details @@ -23,8 +22,6 @@ final class EnginesController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Server/ExportController.php b/src/Controllers/Server/ExportController.php index 85d04bdf76..e3f9b320a9 100644 --- a/src/Controllers/Server/ExportController.php +++ b/src/Controllers/Server/ExportController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Url; use function __; use function array_merge; @@ -32,7 +31,6 @@ final class ExportController implements InvocableController public function __invoke(ServerRequest $request): Response { $GLOBALS['unlim_num_rows'] ??= null; - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); $GLOBALS['tmp_select'] ??= null; $GLOBALS['select_item'] ??= null; diff --git a/src/Controllers/Server/ImportController.php b/src/Controllers/Server/ImportController.php index bce75f0614..28b6272a58 100644 --- a/src/Controllers/Server/ImportController.php +++ b/src/Controllers/Server/ImportController.php @@ -19,7 +19,6 @@ use PhpMyAdmin\Import\ImportSettings; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; @@ -38,14 +37,12 @@ final class ImportController implements InvocableController public function __invoke(ServerRequest $request): Response { $GLOBALS['SESSION_KEY'] ??= null; - $GLOBALS['errorUrl'] ??= null; $this->pageSettings->init('Import'); $pageSettingsErrorHtml = $this->pageSettings->getErrorHTML(); $pageSettingsHtml = $this->pageSettings->getHTML(); $this->response->addScriptFiles(['import.js']); - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); diff --git a/src/Controllers/Server/PluginsController.php b/src/Controllers/Server/PluginsController.php index d1e877237a..64ed4acbdc 100644 --- a/src/Controllers/Server/PluginsController.php +++ b/src/Controllers/Server/PluginsController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Plugins; -use PhpMyAdmin\Url; use function array_keys; use function ksort; @@ -31,8 +30,6 @@ final class PluginsController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Server/PrivilegesController.php b/src/Controllers/Server/PrivilegesController.php index 26cc056ffa..8c16097a28 100644 --- a/src/Controllers/Server/PrivilegesController.php +++ b/src/Controllers/Server/PrivilegesController.php @@ -46,7 +46,6 @@ final class PrivilegesController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; $GLOBALS['message'] ??= null; $GLOBALS['username'] ??= null; $GLOBALS['hostname'] ??= null; @@ -76,7 +75,7 @@ final class PrivilegesController implements InvocableController ]); } - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); + $errorUrl = Url::getFromRoute('/'); if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); @@ -253,7 +252,7 @@ final class PrivilegesController implements InvocableController */ if ($request->hasBodyParam('change_pw')) { $GLOBALS['message'] = $serverPrivileges->updatePassword( - $GLOBALS['errorUrl'], + $errorUrl, $GLOBALS['username'] ?? '', $GLOBALS['hostname'] ?? '', ); diff --git a/src/Controllers/Server/ReplicationController.php b/src/Controllers/Server/ReplicationController.php index 281c1ef6bc..238bf92059 100644 --- a/src/Controllers/Server/ReplicationController.php +++ b/src/Controllers/Server/ReplicationController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Replication\ReplicationGui; use PhpMyAdmin\Replication\ReplicationInfo; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; use function is_array; @@ -33,14 +32,10 @@ final class ReplicationController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $hasReplicaClearScreen = (bool) $request->getParsedBodyParamAsStringOrNull('replica_clear_screen'); $replicaConfigure = $request->getParsedBodyParam('replica_configure'); $primaryConfigure = $request->getParsedBodyParam('primary_configure'); - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Server/ShowEngineController.php b/src/Controllers/Server/ShowEngineController.php index ab3600c0f3..6358297005 100644 --- a/src/Controllers/Server/ShowEngineController.php +++ b/src/Controllers/Server/ShowEngineController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\StorageEngine; -use PhpMyAdmin\Url; use function is_array; use function is_string; @@ -31,8 +30,6 @@ final class ShowEngineController implements InvocableController { $this->setEngineAndPageProperties($request->getAttribute('routeVars')); - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Server/SqlController.php b/src/Controllers/Server/SqlController.php index c26eab0ab0..5bca38ce67 100644 --- a/src/Controllers/Server/SqlController.php +++ b/src/Controllers/Server/SqlController.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlQueryForm; -use PhpMyAdmin\Url; /** * Server SQL executor @@ -28,14 +27,11 @@ final class SqlController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $this->response->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']); $this->pageSettings->init('Sql'); $this->response->addHTML($this->pageSettings->getErrorHTML()); $this->response->addHTML($this->pageSettings->getHTML()); - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); diff --git a/src/Controllers/Server/Status/Monitor/ChartingDataController.php b/src/Controllers/Server/Status/Monitor/ChartingDataController.php index 9349a09e31..b7cb2faaf1 100644 --- a/src/Controllers/Server/Status/Monitor/ChartingDataController.php +++ b/src/Controllers/Server/Status/Monitor/ChartingDataController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; final class ChartingDataController extends AbstractController implements InvocableController { @@ -29,10 +28,7 @@ final class ChartingDataController extends AbstractController implements Invocab public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $requiredData = $request->getParsedBodyParamAsString('requiredData', ''); - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); diff --git a/src/Controllers/Server/Status/Monitor/GeneralLogController.php b/src/Controllers/Server/Status/Monitor/GeneralLogController.php index 9636d57385..c48b48df6d 100644 --- a/src/Controllers/Server/Status/Monitor/GeneralLogController.php +++ b/src/Controllers/Server/Status/Monitor/GeneralLogController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; final class GeneralLogController extends AbstractController implements InvocableController { @@ -29,10 +28,6 @@ final class GeneralLogController extends AbstractController implements Invocable public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Server/Status/Monitor/LogVarsController.php b/src/Controllers/Server/Status/Monitor/LogVarsController.php index cb614691cc..a8185eec07 100644 --- a/src/Controllers/Server/Status/Monitor/LogVarsController.php +++ b/src/Controllers/Server/Status/Monitor/LogVarsController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; final class LogVarsController extends AbstractController implements InvocableController { @@ -29,10 +28,6 @@ final class LogVarsController extends AbstractController implements InvocableCon public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Server/Status/Monitor/QueryAnalyzerController.php b/src/Controllers/Server/Status/Monitor/QueryAnalyzerController.php index 04ea58e1de..adba62949d 100644 --- a/src/Controllers/Server/Status/Monitor/QueryAnalyzerController.php +++ b/src/Controllers/Server/Status/Monitor/QueryAnalyzerController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; final class QueryAnalyzerController extends AbstractController implements InvocableController { @@ -29,10 +28,6 @@ final class QueryAnalyzerController extends AbstractController implements Invoca public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Server/Status/Monitor/SlowLogController.php b/src/Controllers/Server/Status/Monitor/SlowLogController.php index 658efb1fd6..d5598f5148 100644 --- a/src/Controllers/Server/Status/Monitor/SlowLogController.php +++ b/src/Controllers/Server/Status/Monitor/SlowLogController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Monitor; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; final class SlowLogController extends AbstractController implements InvocableController { @@ -29,10 +28,6 @@ final class SlowLogController extends AbstractController implements InvocableCon public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Server/Status/MonitorController.php b/src/Controllers/Server/Status/MonitorController.php index 81a391ce9c..e6d30a9a71 100644 --- a/src/Controllers/Server/Status/MonitorController.php +++ b/src/Controllers/Server/Status/MonitorController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\SysInfo\SysInfo; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; use function is_numeric; use function microtime; @@ -30,8 +29,6 @@ final class MonitorController extends AbstractController implements InvocableCon public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Server/Status/ProcessesController.php b/src/Controllers/Server/Status/ProcessesController.php index a15fc7f713..4644fbc794 100644 --- a/src/Controllers/Server/Status/ProcessesController.php +++ b/src/Controllers/Server/Status/ProcessesController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Server\Status\Processes; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; final class ProcessesController extends AbstractController implements InvocableController { @@ -28,8 +27,6 @@ final class ProcessesController extends AbstractController implements InvocableC public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - $showExecuting = $request->hasBodyParam('showExecuting'); $full = $request->getParsedBodyParam('full') === '1'; $orderByField = $request->getParsedBodyParamAsString('order_by_field', ''); diff --git a/src/Controllers/Server/Status/QueriesController.php b/src/Controllers/Server/Status/QueriesController.php index da45322baa..f452e6c149 100644 --- a/src/Controllers/Server/Status/QueriesController.php +++ b/src/Controllers/Server/Status/QueriesController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; use function __; use function array_keys; @@ -40,8 +39,6 @@ final class QueriesController extends AbstractController implements InvocableCon public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Server/Status/StatusController.php b/src/Controllers/Server/Status/StatusController.php index 57a9c21758..6ae5b3b807 100644 --- a/src/Controllers/Server/Status/StatusController.php +++ b/src/Controllers/Server/Status/StatusController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\Replication\ReplicationGui; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; use PhpMyAdmin\Util; use function __; @@ -36,8 +35,6 @@ final class StatusController extends AbstractController implements InvocableCont public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Server/Status/VariablesController.php b/src/Controllers/Server/Status/VariablesController.php index a8149e23bc..64725eb8d9 100644 --- a/src/Controllers/Server/Status/VariablesController.php +++ b/src/Controllers/Server/Status/VariablesController.php @@ -15,7 +15,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; use function __; use function in_array; @@ -35,13 +34,10 @@ final class VariablesController extends AbstractController implements InvocableC public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $filterAlert = $request->getParsedBodyParam('filterAlert'); $filterText = $request->getParsedBodyParam('filterText'); $filterCategory = $request->getParsedBodyParam('filterCategory'); $dontFormat = $request->getParsedBodyParam('dontFormat'); - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); diff --git a/src/Controllers/Server/VariablesController.php b/src/Controllers/Server/VariablesController.php index 4144196b82..8f35b751de 100644 --- a/src/Controllers/Server/VariablesController.php +++ b/src/Controllers/Server/VariablesController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Providers\ServerVariables\ServerVariablesProvider; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; use PhpMyAdmin\Util; use function implode; @@ -36,8 +35,6 @@ final class VariablesController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); - if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); } diff --git a/src/Controllers/Sql/SqlController.php b/src/Controllers/Sql/SqlController.php index 57a647c3a7..f6d25c06a4 100644 --- a/src/Controllers/Sql/SqlController.php +++ b/src/Controllers/Sql/SqlController.php @@ -43,7 +43,6 @@ class SqlController implements InvocableController { $GLOBALS['display_query'] ??= null; $GLOBALS['ajax_reload'] ??= null; - $GLOBALS['errorUrl'] ??= null; $GLOBALS['unlim_num_rows'] ??= null; $GLOBALS['import_text'] ??= null; $GLOBALS['disp_query'] ??= null; @@ -82,19 +81,17 @@ class SqlController implements InvocableController } } - if (! isset($GLOBALS['errorUrl'])) { - $GLOBALS['errorUrl'] = UrlParams::$back !== '' ? UrlParams::$back : UrlParams::$goto; - $GLOBALS['errorUrl'] .= Url::getCommon( - ['db' => Current::$database], - ! str_contains($GLOBALS['errorUrl'], '?') ? '?' : '&', - ); - if ( - (mb_strpos(' ' . $GLOBALS['errorUrl'], 'db_') !== 1 - || ! str_contains($GLOBALS['errorUrl'], '?route=/database/')) - && Current::$table !== '' - ) { - $GLOBALS['errorUrl'] .= '&table=' . urlencode(Current::$table); - } + $errorUrl = UrlParams::$back !== '' ? UrlParams::$back : UrlParams::$goto; + $errorUrl .= Url::getCommon( + ['db' => Current::$database], + ! str_contains($errorUrl, '?') ? '?' : '&', + ); + if ( + (mb_strpos(' ' . $errorUrl, 'db_') !== 1 + || ! str_contains($errorUrl, '?route=/database/')) + && Current::$table !== '' + ) { + $errorUrl .= '&table=' . urlencode(Current::$table); } /** @var array|null $bkmFields */ @@ -162,7 +159,7 @@ class SqlController implements InvocableController __('"DROP DATABASE" statements are disabled.'), '', false, - $GLOBALS['errorUrl'], + $errorUrl, ); } diff --git a/src/Controllers/Table/AddFieldController.php b/src/Controllers/Table/AddFieldController.php index 2b5654e0dd..7298bb7a9b 100644 --- a/src/Controllers/Table/AddFieldController.php +++ b/src/Controllers/Table/AddFieldController.php @@ -23,7 +23,6 @@ use PhpMyAdmin\Table\ColumnsDefinition; use PhpMyAdmin\Transformations; use PhpMyAdmin\Url; use PhpMyAdmin\UserPrivilegesFactory; -use PhpMyAdmin\Util; use function __; use function is_array; @@ -49,7 +48,6 @@ final class AddFieldController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; $GLOBALS['message'] ??= null; $numberOfFields = $request->getParsedBodyParamAsStringOrNull('num_fields'); @@ -71,7 +69,7 @@ final class AddFieldController implements InvocableController /** * Defines the url to return to in case of error in a sql statement */ - $GLOBALS['errorUrl'] = Url::getFromRoute( + $errorUrl = Url::getFromRoute( '/table/sql', ['db' => Current::$database, 'table' => Current::$table], ); @@ -102,11 +100,11 @@ final class AddFieldController implements InvocableController $result = $createAddField->tryColumnCreationQuery( DatabaseName::from(Current::$database), Current::$sqlQuery, - $GLOBALS['errorUrl'], + $errorUrl, ); if (! $result) { - $errorMessageHtml = Generator::mysqlDie('', '', false, $GLOBALS['errorUrl'], false); + $errorMessageHtml = Generator::mysqlDie('', '', false, $errorUrl, false); $this->response->addHTML($errorMessageHtml ?? ''); $this->response->setRequestStatus(false); @@ -156,10 +154,6 @@ final class AddFieldController implements InvocableController return $this->response->response(); } - $urlParams = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table'); - $GLOBALS['errorUrl'] .= Url::getCommon($urlParams, '&'); - $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { if ($request->isAjax()) { diff --git a/src/Controllers/Table/ChangeController.php b/src/Controllers/Table/ChangeController.php index e4c39c8bdf..7ea3f3c3ac 100644 --- a/src/Controllers/Table/ChangeController.php +++ b/src/Controllers/Table/ChangeController.php @@ -52,7 +52,6 @@ class ChangeController implements InvocableController public function __invoke(ServerRequest $request): Response { $GLOBALS['disp_message'] ??= null; - $GLOBALS['errorUrl'] ??= null; $GLOBALS['where_clause'] ??= null; $GLOBALS['unsaved_values'] ??= null; $GLOBALS['current_result'] ??= null; @@ -141,7 +140,7 @@ class ChangeController implements InvocableController UrlParams::$params['table'] = Current::$table; } - $GLOBALS['errorUrl'] = UrlParams::$goto . Url::getCommon( + $errorUrl = UrlParams::$goto . Url::getCommon( UrlParams::$params, ! str_contains(UrlParams::$goto, '?') ? '?' : '&', ); @@ -181,7 +180,7 @@ class ChangeController implements InvocableController Current::$table, $whereClauses, $whereClauseArray, - $GLOBALS['errorUrl'], + $errorUrl, ); /** @@ -283,7 +282,7 @@ class ChangeController implements InvocableController Current::$table, Current::$database, $whereClauseArray, - $GLOBALS['errorUrl'], + $errorUrl, ); } diff --git a/src/Controllers/Table/ChartController.php b/src/Controllers/Table/ChartController.php index 3f39f81cfe..50ca824436 100644 --- a/src/Controllers/Table/ChartController.php +++ b/src/Controllers/Table/ChartController.php @@ -44,8 +44,6 @@ final class ChartController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - if (isset($_REQUEST['pos'], $_REQUEST['session_max_rows']) && $request->isAjax()) { $this->ajax($request); @@ -80,8 +78,6 @@ final class ChartController implements InvocableController } $urlParams = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabTable'], 'table'); - $GLOBALS['errorUrl'] .= Url::getCommon($urlParams, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { @@ -118,9 +114,6 @@ final class ChartController implements InvocableController $urlParams['goto'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database'); $urlParams['back'] = Url::getFromRoute('/sql'); - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabDatabase'], 'database'); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); - $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { if ($request->isAjax()) { @@ -137,7 +130,6 @@ final class ChartController implements InvocableController } else { $urlParams['goto'] = Util::getScriptNameForOption($config->settings['DefaultTabServer'], 'server'); $urlParams['back'] = Url::getFromRoute('/sql'); - $GLOBALS['errorUrl'] = Url::getFromRoute('/'); if ($this->dbi->isSuperUser()) { $this->dbi->selectDb('mysql'); @@ -199,14 +191,8 @@ final class ChartController implements InvocableController */ public function ajax(ServerRequest $request): void { - $GLOBALS['errorUrl'] ??= null; if (Current::$table !== '' && Current::$database !== '') { UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabTable'], - 'table', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Table/DeleteConfirmController.php b/src/Controllers/Table/DeleteConfirmController.php index d09390d717..561d81cd1d 100644 --- a/src/Controllers/Table/DeleteConfirmController.php +++ b/src/Controllers/Table/DeleteConfirmController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; -use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\DbTableExists; @@ -14,9 +13,7 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; -use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; use function __; @@ -32,8 +29,6 @@ final class DeleteConfirmController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $selected = $_POST['rows_to_delete'] ?? null; if (! isset($selected) || ! is_array($selected)) { @@ -52,11 +47,6 @@ final class DeleteConfirmController implements InvocableController } UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabTable'], - 'table', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Table/ExportController.php b/src/Controllers/Table/ExportController.php index 3e4ac92160..d352261478 100644 --- a/src/Controllers/Table/ExportController.php +++ b/src/Controllers/Table/ExportController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; -use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; @@ -19,7 +18,6 @@ use PhpMyAdmin\SqlParser\Statements\SelectStatement; use PhpMyAdmin\SqlParser\Utils\Query; use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; -use PhpMyAdmin\Util; use function __; use function array_merge; @@ -37,7 +35,6 @@ class ExportController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; $GLOBALS['where_clause'] ??= null; $GLOBALS['unlim_num_rows'] ??= null; @@ -56,11 +53,6 @@ class ExportController implements InvocableController } UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabTable'], - 'table', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); UrlParams::$params['goto'] = Url::getFromRoute('/table/export'); UrlParams::$params['back'] = Url::getFromRoute('/table/export'); diff --git a/src/Controllers/Table/FindReplaceController.php b/src/Controllers/Table/FindReplaceController.php index f66de86088..1c383508ff 100644 --- a/src/Controllers/Table/FindReplaceController.php +++ b/src/Controllers/Table/FindReplaceController.php @@ -18,7 +18,6 @@ use PhpMyAdmin\Message; use PhpMyAdmin\MessageType; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; use PhpMyAdmin\Util; @@ -55,7 +54,6 @@ final class FindReplaceController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; if (Current::$database === '') { return $this->response->missingParameterError('db'); } @@ -65,11 +63,6 @@ final class FindReplaceController implements InvocableController } UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabTable'], - 'table', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Table/GisVisualizationController.php b/src/Controllers/Table/GisVisualizationController.php index a0bb28ba55..d4963147ea 100644 --- a/src/Controllers/Table/GisVisualizationController.php +++ b/src/Controllers/Table/GisVisualizationController.php @@ -53,12 +53,6 @@ final class GisVisualizationController implements InvocableController return $this->response->missingParameterError('db'); } - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabDatabase'], - 'database', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); - $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { if ($request->isAjax()) { diff --git a/src/Controllers/Table/ImportController.php b/src/Controllers/Table/ImportController.php index 6fc46b9052..b3ca3de045 100644 --- a/src/Controllers/Table/ImportController.php +++ b/src/Controllers/Table/ImportController.php @@ -43,7 +43,6 @@ final class ImportController implements InvocableController public function __invoke(ServerRequest $request): Response { $GLOBALS['SESSION_KEY'] ??= null; - $GLOBALS['errorUrl'] ??= null; $this->pageSettings->init('Import'); $pageSettingsErrorHtml = $this->pageSettings->getErrorHTML(); @@ -61,8 +60,6 @@ final class ImportController implements InvocableController UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; $config = Config::getInstance(); - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabTable'], 'table'); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Table/IndexRenameController.php b/src/Controllers/Table/IndexRenameController.php index 7b8a8cfdb9..b08e465e37 100644 --- a/src/Controllers/Table/IndexRenameController.php +++ b/src/Controllers/Table/IndexRenameController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; -use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; @@ -20,9 +19,7 @@ use PhpMyAdmin\MessageType; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Indexes; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; -use PhpMyAdmin\Util; use function __; @@ -39,8 +36,6 @@ final class IndexRenameController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - if (Current::$database === '') { return $this->response->missingParameterError('db'); } @@ -50,11 +45,6 @@ final class IndexRenameController implements InvocableController } UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabTable'], - 'table', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Table/IndexesController.php b/src/Controllers/Table/IndexesController.php index 5335fe6796..051a761ee5 100644 --- a/src/Controllers/Table/IndexesController.php +++ b/src/Controllers/Table/IndexesController.php @@ -21,9 +21,7 @@ use PhpMyAdmin\MessageType; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Indexes; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; -use PhpMyAdmin\Util; use function __; use function count; @@ -48,8 +46,6 @@ final class IndexesController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - if (! isset($_POST['create_edit_table'])) { if (Current::$database === '') { return $this->response->missingParameterError('db'); @@ -60,11 +56,6 @@ final class IndexesController implements InvocableController } UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabTable'], - 'table', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Table/ReplaceController.php b/src/Controllers/Table/ReplaceController.php index 2e1ddc59e0..b79664c01d 100644 --- a/src/Controllers/Table/ReplaceController.php +++ b/src/Controllers/Table/ReplaceController.php @@ -72,7 +72,6 @@ final class ReplaceController implements InvocableController return $this->response->missingParameterError('goto'); } - $GLOBALS['errorUrl'] ??= null; $GLOBALS['unsaved_values'] ??= null; $GLOBALS['disp_query'] ??= null; $GLOBALS['disp_message'] ??= null; @@ -99,9 +98,6 @@ final class ReplaceController implements InvocableController //get $goto_include for different cases $gotoInclude = $this->insertEdit->getGotoInclude(false); - // Defines the url to return in case of failure of the query - $GLOBALS['errorUrl'] = $this->insertEdit->getErrorUrl(UrlParams::$params); - /** * Prepares the update/insert of a row */ diff --git a/src/Controllers/Table/SearchController.php b/src/Controllers/Table/SearchController.php index 63bb616b2c..96dcdefa44 100644 --- a/src/Controllers/Table/SearchController.php +++ b/src/Controllers/Table/SearchController.php @@ -22,7 +22,6 @@ use PhpMyAdmin\Sql; use PhpMyAdmin\Table\Search; use PhpMyAdmin\Template; use PhpMyAdmin\Transformations; -use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\Gis; @@ -165,11 +164,6 @@ final class SearchController implements InvocableController } UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabTable'], - 'table', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Table/SqlController.php b/src/Controllers/Table/SqlController.php index 5c0b46e61f..db6126e4f4 100644 --- a/src/Controllers/Table/SqlController.php +++ b/src/Controllers/Table/SqlController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; -use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; @@ -18,7 +17,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlQueryForm; use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; -use PhpMyAdmin\Util; use function __; use function htmlspecialchars; @@ -38,8 +36,6 @@ class SqlController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $this->response->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']); $this->pageSettings->init('Sql'); @@ -54,13 +50,6 @@ class SqlController implements InvocableController return $this->response->missingParameterError('table'); } - $urlParams = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabTable'], - 'table', - ); - $GLOBALS['errorUrl'] .= Url::getCommon($urlParams, '&'); - $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { if ($request->isAjax()) { diff --git a/src/Controllers/Table/Structure/PrimaryController.php b/src/Controllers/Table/Structure/PrimaryController.php index 76c7676a23..ddc171e877 100644 --- a/src/Controllers/Table/Structure/PrimaryController.php +++ b/src/Controllers/Table/Structure/PrimaryController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table\Structure; -use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Controllers\Table\StructureController; use PhpMyAdmin\Current; @@ -16,7 +15,6 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; use PhpMyAdmin\Util; @@ -37,7 +35,6 @@ final class PrimaryController implements InvocableController public function __invoke(ServerRequest $request): Response { $GLOBALS['message'] ??= null; - $GLOBALS['errorUrl'] ??= null; /** @var string[]|null $selected */ $selected = $request->getParsedBodyParam('selected_fld', $request->getParsedBodyParam('selected')); @@ -64,11 +61,6 @@ final class PrimaryController implements InvocableController } UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabTable'], - 'table', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Table/StructureController.php b/src/Controllers/Table/StructureController.php index 75af6909ab..2868e6cf0c 100644 --- a/src/Controllers/Table/StructureController.php +++ b/src/Controllers/Table/StructureController.php @@ -32,7 +32,6 @@ use PhpMyAdmin\Table\Table; use PhpMyAdmin\Template; use PhpMyAdmin\Tracking\Tracker; use PhpMyAdmin\Transformations; -use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; use stdClass; @@ -63,8 +62,6 @@ class StructureController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $this->dbi->selectDb(Current::$database); $this->pageSettings->init('TableStructure'); @@ -84,12 +81,6 @@ class StructureController implements InvocableController } $isSystemSchema = Utilities::isSystemSchema(Current::$database); - $urlParams = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabTable'], - 'table', - ); - $GLOBALS['errorUrl'] .= Url::getCommon($urlParams, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Table/TrackingController.php b/src/Controllers/Table/TrackingController.php index 1c09d2d9c2..87f76f53b9 100644 --- a/src/Controllers/Table/TrackingController.php +++ b/src/Controllers/Table/TrackingController.php @@ -5,7 +5,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; use DateTimeImmutable; -use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Core; use PhpMyAdmin\Current; @@ -23,7 +22,6 @@ use PhpMyAdmin\Tracking\Tracking; use PhpMyAdmin\Tracking\TrackingChecker; use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; -use PhpMyAdmin\Util; use Throwable; use Webmozart\Assert\Assert; @@ -49,8 +47,6 @@ final class TrackingController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; - $this->response->addScriptFiles(['vendor/jquery/jquery.tablesorter.js', 'table/tracking.js']); if (Current::$database === '') { @@ -62,11 +58,6 @@ final class TrackingController implements InvocableController } UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabTable'], - 'table', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Table/ZoomSearchController.php b/src/Controllers/Table/ZoomSearchController.php index 24c2583222..f3f6d8cdd3 100644 --- a/src/Controllers/Table/ZoomSearchController.php +++ b/src/Controllers/Table/ZoomSearchController.php @@ -20,7 +20,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Search; use PhpMyAdmin\Template; use PhpMyAdmin\UniqueCondition; -use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\Gis; @@ -82,7 +81,6 @@ final class ZoomSearchController implements InvocableController public function __invoke(ServerRequest $request): Response { - $GLOBALS['errorUrl'] ??= null; if (Current::$database === '') { return $this->response->missingParameterError('db'); } @@ -93,8 +91,6 @@ final class ZoomSearchController implements InvocableController UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; $config = Config::getInstance(); - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabTable'], 'table'); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { diff --git a/src/Controllers/Triggers/IndexController.php b/src/Controllers/Triggers/IndexController.php index 609f538e03..bb84196bb8 100644 --- a/src/Controllers/Triggers/IndexController.php +++ b/src/Controllers/Triggers/IndexController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Triggers; -use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; @@ -19,7 +18,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Triggers\Trigger; use PhpMyAdmin\Triggers\Triggers; -use PhpMyAdmin\Url; use PhpMyAdmin\UrlParams; use PhpMyAdmin\Util; @@ -48,12 +46,10 @@ final class IndexController implements InvocableController public function __invoke(ServerRequest $request): Response { $GLOBALS['errors'] ??= null; - $GLOBALS['errorUrl'] ??= null; $this->response->addScriptFiles(['triggers.js', 'sql.js']); if (! $request->isAjax()) { - $config = Config::getInstance(); if (Current::$database === '') { return $this->response->missingParameterError('db'); } @@ -63,8 +59,6 @@ final class IndexController implements InvocableController */ if (Current::$table !== '' && in_array(Current::$table, $this->dbi->getTables(Current::$database), true)) { UrlParams::$params = ['db' => Current::$database, 'table' => Current::$table]; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption($config->settings['DefaultTabTable'], 'table'); - $GLOBALS['errorUrl'] .= Url::getCommon(UrlParams::$params, '&'); $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { @@ -85,12 +79,6 @@ final class IndexController implements InvocableController } else { Current::$table = ''; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - $config->settings['DefaultTabDatabase'], - 'database', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); - $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { $this->response->redirectToRoute( diff --git a/src/Controllers/View/CreateController.php b/src/Controllers/View/CreateController.php index fb7a11f8c0..4cc34ac845 100644 --- a/src/Controllers/View/CreateController.php +++ b/src/Controllers/View/CreateController.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\View; -use PhpMyAdmin\Config; use PhpMyAdmin\Container\ContainerBuilder; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Controllers\Table\StructureController; @@ -61,12 +60,6 @@ final class CreateController implements InvocableController $GLOBALS['message'] ??= null; - $GLOBALS['errorUrl'] = Util::getScriptNameForOption( - Config::getInstance()->settings['DefaultTabDatabase'], - 'database', - ); - $GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&'); - $databaseName = DatabaseName::tryFrom($request->getParam('db')); if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) { if ($request->isAjax()) { diff --git a/src/Export/Export.php b/src/Export/Export.php index b4cacd7d2e..6990ae4de7 100644 --- a/src/Export/Export.php +++ b/src/Export/Export.php @@ -495,7 +495,6 @@ class Export * @param string|mixed[] $dbSelect the selected databases to export * @param string $whatStrucOrData structure or data or both * @param ExportPlugin $exportPlugin the selected export plugin - * @param string $errorUrl the URL in case of error * @param string $exportType the export type * @param bool $doRelation whether to export relation info * @param bool $doComments whether to add comments @@ -508,7 +507,6 @@ class Export string|array $dbSelect, string $whatStrucOrData, ExportPlugin $exportPlugin, - string $errorUrl, string $exportType, bool $doRelation, bool $doComments, @@ -536,7 +534,6 @@ class Export $tables, $tables, $exportPlugin, - $errorUrl, $exportType, $doRelation, $doComments, @@ -562,7 +559,6 @@ class Export * @param string[] $tableStructure whether to export structure for each table * @param string[] $tableData whether to export data for each table * @param ExportPlugin $exportPlugin the selected export plugin - * @param string $errorUrl the URL in case of error * @param string $exportType the export type * @param bool $doRelation whether to export relation info * @param bool $doComments whether to add comments @@ -578,7 +574,6 @@ class Export array $tableStructure, array $tableData, ExportPlugin $exportPlugin, - string $errorUrl, string $exportType, bool $doRelation, bool $doComments, @@ -707,7 +702,7 @@ class Export . ' FROM ' . Util::backquote($db->getName()) . '.' . Util::backquote($table); - if (! $exportPlugin->exportData($db->getName(), $table, $errorUrl, $localQuery, $aliases)) { + if (! $exportPlugin->exportData($db->getName(), $table, $localQuery, $aliases)) { break; } } @@ -823,14 +818,12 @@ class Export * * @param string $whatStrucOrData whether to export structure for each table or raw * @param ExportPlugin $exportPlugin the selected export plugin - * @param string $errorUrl the URL in case of error * @param string|null $db the database where the query is executed * @param string $sqlQuery the query to be executed */ public static function exportRaw( string $whatStrucOrData, ExportPlugin $exportPlugin, - string $errorUrl, string|null $db, string $sqlQuery, ): void { @@ -839,7 +832,7 @@ class Export return; } - if ($exportPlugin->exportRawQuery($errorUrl, $db, $sqlQuery)) { + if ($exportPlugin->exportRawQuery($db, $sqlQuery)) { return; } @@ -857,7 +850,6 @@ class Export * @param string $table the table to export * @param string $whatStrucOrData structure or data or both * @param ExportPlugin $exportPlugin the selected export plugin - * @param string $errorUrl the URL in case of error * @param string $exportType the export type * @param bool $doRelation whether to export relation info * @param bool $doComments whether to add comments @@ -874,7 +866,6 @@ class Export string $table, string $whatStrucOrData, ExportPlugin $exportPlugin, - string $errorUrl, string $exportType, bool $doRelation, bool $doComments, @@ -963,7 +954,7 @@ class Export . '.' . Util::backquote($table) . $addQuery; } - if (! $exportPlugin->exportData($db, $table, $errorUrl, $localQuery, $aliases)) { + if (! $exportPlugin->exportData($db, $table, $localQuery, $aliases)) { return; } } diff --git a/src/Plugins/Export/ExportCodegen.php b/src/Plugins/Export/ExportCodegen.php index 256baabb6c..056d4fe4ef 100644 --- a/src/Plugins/Export/ExportCodegen.php +++ b/src/Plugins/Export/ExportCodegen.php @@ -130,14 +130,12 @@ class ExportCodegen extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { diff --git a/src/Plugins/Export/ExportCsv.php b/src/Plugins/Export/ExportCsv.php index 804597145f..f0746ff9f6 100644 --- a/src/Plugins/Export/ExportCsv.php +++ b/src/Plugins/Export/ExportCsv.php @@ -188,14 +188,12 @@ class ExportCsv extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -307,16 +305,15 @@ class ExportCsv extends ExportPlugin /** * Outputs result of raw query in CSV format * - * @param string $errorUrl the url to go back in case of error * @param string|null $db the database where the query is executed * @param string $sqlQuery the rawquery to output */ - public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool + public function exportRawQuery(string|null $db, string $sqlQuery): bool { if ($db !== null) { DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } } diff --git a/src/Plugins/Export/ExportHtmlword.php b/src/Plugins/Export/ExportHtmlword.php index f04b50e6a4..7de23ba12a 100644 --- a/src/Plugins/Export/ExportHtmlword.php +++ b/src/Plugins/Export/ExportHtmlword.php @@ -166,14 +166,12 @@ class ExportHtmlword extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { diff --git a/src/Plugins/Export/ExportJson.php b/src/Plugins/Export/ExportJson.php index e68bf8534d..b80d422ad0 100644 --- a/src/Plugins/Export/ExportJson.php +++ b/src/Plugins/Export/ExportJson.php @@ -170,14 +170,12 @@ class ExportJson extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -305,11 +303,10 @@ class ExportJson extends ExportPlugin /** * Outputs result raw query in JSON format * - * @param string $errorUrl the url to go back in case of error * @param string|null $db the database where the query is executed * @param string $sqlQuery the rawquery to output */ - public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool + public function exportRawQuery(string|null $db, string $sqlQuery): bool { $buffer = $this->encode(['type' => 'raw', 'data' => '@@DATA@@']); if ($buffer === false) { diff --git a/src/Plugins/Export/ExportLatex.php b/src/Plugins/Export/ExportLatex.php index 5ad445936b..6546e06663 100644 --- a/src/Plugins/Export/ExportLatex.php +++ b/src/Plugins/Export/ExportLatex.php @@ -272,14 +272,12 @@ class ExportLatex extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -400,17 +398,16 @@ class ExportLatex extends ExportPlugin /** * Outputs result raw query * - * @param string $errorUrl the url to go back in case of error * @param string|null $db the database where the query is executed * @param string $sqlQuery the rawquery to output */ - public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool + public function exportRawQuery(string|null $db, string $sqlQuery): bool { if ($db !== null) { DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } /** diff --git a/src/Plugins/Export/ExportMediawiki.php b/src/Plugins/Export/ExportMediawiki.php index 86f3972ed7..eed19c6821 100644 --- a/src/Plugins/Export/ExportMediawiki.php +++ b/src/Plugins/Export/ExportMediawiki.php @@ -242,14 +242,12 @@ class ExportMediawiki extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -320,17 +318,16 @@ class ExportMediawiki extends ExportPlugin /** * Outputs result raw query in MediaWiki format * - * @param string $errorUrl the url to go back in case of error * @param string|null $db the database where the query is executed * @param string $sqlQuery the rawquery to output */ - public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool + public function exportRawQuery(string|null $db, string $sqlQuery): bool { if ($db !== null) { DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } /** diff --git a/src/Plugins/Export/ExportOds.php b/src/Plugins/Export/ExportOds.php index 519f3233ac..d9e1c849fb 100644 --- a/src/Plugins/Export/ExportOds.php +++ b/src/Plugins/Export/ExportOds.php @@ -186,14 +186,12 @@ class ExportOds extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -306,16 +304,15 @@ class ExportOds extends ExportPlugin /** * Outputs result raw query in ODS format * - * @param string $errorUrl the url to go back in case of error * @param string|null $db the database where the query is executed * @param string $sqlQuery the rawquery to output */ - public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool + public function exportRawQuery(string|null $db, string $sqlQuery): bool { if ($db !== null) { DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } } diff --git a/src/Plugins/Export/ExportOdt.php b/src/Plugins/Export/ExportOdt.php index 55451a7bd0..6aaa0646ce 100644 --- a/src/Plugins/Export/ExportOdt.php +++ b/src/Plugins/Export/ExportOdt.php @@ -212,14 +212,12 @@ class ExportOdt extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -314,17 +312,16 @@ class ExportOdt extends ExportPlugin /** * Outputs result raw query in ODT format * - * @param string $errorUrl the url to go back in case of error * @param string|null $db the database where the query is executed * @param string $sqlQuery the rawquery to output */ - public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool + public function exportRawQuery(string|null $db, string $sqlQuery): bool { if ($db !== null) { DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } /** diff --git a/src/Plugins/Export/ExportPdf.php b/src/Plugins/Export/ExportPdf.php index 4d2fc492d1..372dd5026c 100644 --- a/src/Plugins/Export/ExportPdf.php +++ b/src/Plugins/Export/ExportPdf.php @@ -158,14 +158,12 @@ class ExportPdf extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -187,11 +185,10 @@ class ExportPdf extends ExportPlugin /** * Outputs result of raw query in PDF format * - * @param string $errorUrl the url to go back in case of error * @param string|null $db the database where the query is executed * @param string $sqlQuery the rawquery to output */ - public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool + public function exportRawQuery(string|null $db, string $sqlQuery): bool { $pdf = $this->getPdf(); $pdf->setDbAlias('----'); diff --git a/src/Plugins/Export/ExportPhparray.php b/src/Plugins/Export/ExportPhparray.php index 83f37ec652..5d72cda226 100644 --- a/src/Plugins/Export/ExportPhparray.php +++ b/src/Plugins/Export/ExportPhparray.php @@ -143,14 +143,12 @@ class ExportPhparray extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -232,16 +230,15 @@ class ExportPhparray extends ExportPlugin /** * Outputs result of raw query as PHP array * - * @param string $errorUrl the url to go back in case of error * @param string|null $db the database where the query is executed * @param string $sqlQuery the rawquery to output */ - public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool + public function exportRawQuery(string|null $db, string $sqlQuery): bool { if ($db !== null) { DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } } diff --git a/src/Plugins/Export/ExportSql.php b/src/Plugins/Export/ExportSql.php index 645df9800d..a5469efe69 100644 --- a/src/Plugins/Export/ExportSql.php +++ b/src/Plugins/Export/ExportSql.php @@ -1130,7 +1130,6 @@ class ExportSql extends ExportPlugin ! $this->exportData( $relationParameters->pdfFeature->database->getName(), $relationParameters->pdfFeature->pdfPages->getName(), - '', $sqlQueryRow, $aliases, ) @@ -1156,7 +1155,6 @@ class ExportSql extends ExportPlugin ! $this->exportData( $relationParameters->pdfFeature->database->getName(), $relationParameters->pdfFeature->tableCoords->getName(), - '', $sqlQueryCoords, $aliases, ) @@ -1195,7 +1193,6 @@ class ExportSql extends ExportPlugin ! $this->exportData( (string) $relationParameters->db, (string) $relationParams[$type], - '', $sqlQuery, $aliases, ) @@ -1859,17 +1856,16 @@ class ExportSql extends ExportPlugin /** * Outputs a raw query * - * @param string $errorUrl the url to go back in case of error * @param string|null $db the database where the query is executed * @param string $sqlQuery the rawquery to output */ - public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool + public function exportRawQuery(string|null $db, string $sqlQuery): bool { if ($db !== null) { DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } /** @@ -2033,14 +2029,12 @@ class ExportSql extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { diff --git a/src/Plugins/Export/ExportTexytext.php b/src/Plugins/Export/ExportTexytext.php index 8dd696e790..741d53f20c 100644 --- a/src/Plugins/Export/ExportTexytext.php +++ b/src/Plugins/Export/ExportTexytext.php @@ -150,14 +150,12 @@ class ExportTexytext extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -232,17 +230,16 @@ class ExportTexytext extends ExportPlugin /** * Outputs result raw query in TexyText format * - * @param string $errorUrl the url to go back in case of error * @param string|null $db the database where the query is executed * @param string $sqlQuery the rawquery to output */ - public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool + public function exportRawQuery(string|null $db, string $sqlQuery): bool { if ($db !== null) { DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } /** diff --git a/src/Plugins/Export/ExportXml.php b/src/Plugins/Export/ExportXml.php index 518267b64a..032023bf51 100644 --- a/src/Plugins/Export/ExportXml.php +++ b/src/Plugins/Export/ExportXml.php @@ -397,14 +397,12 @@ class ExportXml extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { diff --git a/src/Plugins/Export/ExportYaml.php b/src/Plugins/Export/ExportYaml.php index fba11e75c3..95c7dc395b 100644 --- a/src/Plugins/Export/ExportYaml.php +++ b/src/Plugins/Export/ExportYaml.php @@ -118,14 +118,12 @@ class ExportYaml extends ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool { @@ -196,16 +194,15 @@ class ExportYaml extends ExportPlugin /** * Outputs result raw query in YAML format * - * @param string $errorUrl the url to go back in case of error * @param string|null $db the database where the query is executed * @param string $sqlQuery the rawquery to output */ - public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool + public function exportRawQuery(string|null $db, string $sqlQuery): bool { if ($db !== null) { DatabaseInterface::getInstance()->selectDb($db); } - return $this->exportData($db ?? '', '', $errorUrl, $sqlQuery); + return $this->exportData($db ?? '', '', $sqlQuery); } } diff --git a/src/Plugins/Export/README.md b/src/Plugins/Export/README.md index 5dbe091110..050491ef45 100644 --- a/src/Plugins/Export/README.md +++ b/src/Plugins/Export/README.md @@ -178,7 +178,6 @@ class Export[Name] extends PhpMyAdmin\Plugins\ExportPlugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param array $aliases Aliases of db/table/columns * @@ -187,7 +186,6 @@ class Export[Name] extends PhpMyAdmin\Plugins\ExportPlugin public function exportData( $db, $table, - $errorUrl, $sqlQuery, array $aliases = [] ) { diff --git a/src/Plugins/ExportPlugin.php b/src/Plugins/ExportPlugin.php index b9709fc207..630f9e926b 100644 --- a/src/Plugins/ExportPlugin.php +++ b/src/Plugins/ExportPlugin.php @@ -76,14 +76,12 @@ abstract class ExportPlugin implements Plugin * * @param string $db database name * @param string $table table name - * @param string $errorUrl the url to go back in case of error * @param string $sqlQuery SQL query for obtaining data * @param mixed[] $aliases Aliases of db/table/columns */ abstract public function exportData( string $db, string $table, - string $errorUrl, string $sqlQuery, array $aliases = [], ): bool; @@ -117,11 +115,10 @@ abstract class ExportPlugin implements Plugin /** * Outputs for raw query * - * @param string $errorUrl the url to go back in case of error * @param string|null $db the database where the query is executed * @param string $sqlQuery the rawquery to output */ - public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool + public function exportRawQuery(string|null $db, string $sqlQuery): bool { return false; } diff --git a/src/Plugins/Import/ImportCsv.php b/src/Plugins/Import/ImportCsv.php index 9cf0807e11..6c10822122 100644 --- a/src/Plugins/Import/ImportCsv.php +++ b/src/Plugins/Import/ImportCsv.php @@ -193,7 +193,6 @@ class ImportCsv extends AbstractImportCsv { $GLOBALS['error'] ??= null; $GLOBALS['message'] ??= null; - $GLOBALS['errorUrl'] ??= null; $replacements = ['\\n' => "\n", '\\t' => "\t", '\\r' => "\r"]; $this->terminated = strtr($this->terminated, $replacements); diff --git a/src/Table/TableMover.php b/src/Table/TableMover.php index a53f90a724..e3aeb606d8 100644 --- a/src/Table/TableMover.php +++ b/src/Table/TableMover.php @@ -46,8 +46,6 @@ class TableMover MoveMode $mode, bool $addDropIfExists, ): bool { - $GLOBALS['errorUrl'] ??= null; - // Try moving the tables directly, using native `RENAME` statement. if ($what === MoveScope::Move) { $tbl = new Table($sourceTable, $sourceDb, $this->dbi); diff --git a/tests/unit/Export/ExportTest.php b/tests/unit/Export/ExportTest.php index 96fc5bd4cc..54c7156fc0 100644 --- a/tests/unit/Export/ExportTest.php +++ b/tests/unit/Export/ExportTest.php @@ -140,7 +140,6 @@ class ExportTest extends AbstractTestCase ['test_table'], ['test_table'], new ExportSql(new Relation($dbi), $export, new Transformations()), - 'index.php?route=/database/export&db=test_db', 'database', false, true, @@ -221,7 +220,6 @@ SQL; ['test_db'], 'structure_and_data', new ExportSql(new Relation($dbi), $export, new Transformations()), - 'index.php?route=/server/export', 'server', false, true, diff --git a/tests/unit/Plugins/Export/ExportCodegenTest.php b/tests/unit/Plugins/Export/ExportCodegenTest.php index 7b84bf6627..9f5fa435e2 100644 --- a/tests/unit/Plugins/Export/ExportCodegenTest.php +++ b/tests/unit/Plugins/Export/ExportCodegenTest.php @@ -174,7 +174,7 @@ class ExportCodegenTest extends AbstractTestCase $GLOBALS['save_on_server'] = false; ob_start(); - $this->object->exportData('test_db', 'test_table', 'localhost', 'SELECT * FROM `test_db`.`test_table`;'); + $this->object->exportData('test_db', 'test_table', 'SELECT * FROM `test_db`.`test_table`;'); $result = ob_get_clean(); self::assertIsString($result); @@ -199,7 +199,7 @@ class ExportCodegenTest extends AbstractTestCase $GLOBALS['codegen_format'] = 4; - $this->object->exportData('test_db', 'test_table', 'localhost', 'SELECT * FROM `test_db`.`test_table`;'); + $this->object->exportData('test_db', 'test_table', 'SELECT * FROM `test_db`.`test_table`;'); $this->expectOutputString('4 is not supported.'); } diff --git a/tests/unit/Plugins/Export/ExportCsvTest.php b/tests/unit/Plugins/Export/ExportCsvTest.php index e46e4478fc..b0de9ff66b 100644 --- a/tests/unit/Plugins/Export/ExportCsvTest.php +++ b/tests/unit/Plugins/Export/ExportCsvTest.php @@ -383,7 +383,6 @@ class ExportCsvTest extends AbstractTestCase self::assertFalse($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); ob_get_clean(); @@ -403,7 +402,6 @@ class ExportCsvTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); @@ -421,7 +419,6 @@ class ExportCsvTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); @@ -442,7 +439,6 @@ class ExportCsvTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); @@ -462,7 +458,6 @@ class ExportCsvTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); @@ -481,7 +476,6 @@ class ExportCsvTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); diff --git a/tests/unit/Plugins/Export/ExportHtmlwordTest.php b/tests/unit/Plugins/Export/ExportHtmlwordTest.php index 01e9516e64..d887222d94 100644 --- a/tests/unit/Plugins/Export/ExportHtmlwordTest.php +++ b/tests/unit/Plugins/Export/ExportHtmlwordTest.php @@ -304,7 +304,6 @@ class ExportHtmlwordTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); diff --git a/tests/unit/Plugins/Export/ExportJsonTest.php b/tests/unit/Plugins/Export/ExportJsonTest.php index 1fc67376fb..6f1de0ab23 100644 --- a/tests/unit/Plugins/Export/ExportJsonTest.php +++ b/tests/unit/Plugins/Export/ExportJsonTest.php @@ -179,7 +179,6 @@ class ExportJsonTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); } @@ -202,7 +201,6 @@ class ExportJsonTest extends AbstractTestCase $this->object->exportData( 'test_db', 'test_table_complex', - 'example.com', 'SELECT * FROM `test_db`.`test_table_complex`;', ), ); @@ -223,7 +221,6 @@ class ExportJsonTest extends AbstractTestCase self::assertTrue( $this->object->exportRawQuery( - 'example.com', null, 'SELECT * FROM `test_db`.`test_table_complex`;', ), diff --git a/tests/unit/Plugins/Export/ExportLatexTest.php b/tests/unit/Plugins/Export/ExportLatexTest.php index c69a47ccab..877a1e050b 100644 --- a/tests/unit/Plugins/Export/ExportLatexTest.php +++ b/tests/unit/Plugins/Export/ExportLatexTest.php @@ -492,7 +492,6 @@ class ExportLatexTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); @@ -523,7 +522,6 @@ class ExportLatexTest extends AbstractTestCase self::assertTrue($this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', )); $result = ob_get_clean(); diff --git a/tests/unit/Plugins/Export/ExportMediawikiTest.php b/tests/unit/Plugins/Export/ExportMediawikiTest.php index 96ce6adaa0..8492ac8d0f 100644 --- a/tests/unit/Plugins/Export/ExportMediawikiTest.php +++ b/tests/unit/Plugins/Export/ExportMediawikiTest.php @@ -294,7 +294,6 @@ class ExportMediawikiTest extends AbstractTestCase $this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', ), ); diff --git a/tests/unit/Plugins/Export/ExportOdsTest.php b/tests/unit/Plugins/Export/ExportOdsTest.php index d7025a521e..8205ccf1e9 100644 --- a/tests/unit/Plugins/Export/ExportOdsTest.php +++ b/tests/unit/Plugins/Export/ExportOdsTest.php @@ -264,7 +264,6 @@ class ExportOdsTest extends AbstractTestCase $this->object->exportData( 'db', 'table', - 'example.com', 'SELECT', ), ); @@ -340,7 +339,6 @@ class ExportOdsTest extends AbstractTestCase $this->object->exportData( 'db', 'table', - 'example.com', 'SELECT', ), ); @@ -392,7 +390,6 @@ class ExportOdsTest extends AbstractTestCase $this->object->exportData( 'db', 'table', - 'example.com', 'SELECT', ), ); diff --git a/tests/unit/Plugins/Export/ExportOdtTest.php b/tests/unit/Plugins/Export/ExportOdtTest.php index 44ad146fcc..1868a63943 100644 --- a/tests/unit/Plugins/Export/ExportOdtTest.php +++ b/tests/unit/Plugins/Export/ExportOdtTest.php @@ -399,7 +399,6 @@ class ExportOdtTest extends AbstractTestCase $this->object->exportData( 'db', 'taobject->exportData( 'db', 'table', - 'example.com', 'SELECT', ), ); @@ -522,7 +520,6 @@ class ExportOdtTest extends AbstractTestCase $this->object->exportData( 'db', 'table', - 'example.com', 'SELECT', ), ); diff --git a/tests/unit/Plugins/Export/ExportPdfTest.php b/tests/unit/Plugins/Export/ExportPdfTest.php index e533abc2a6..0f327af1b6 100644 --- a/tests/unit/Plugins/Export/ExportPdfTest.php +++ b/tests/unit/Plugins/Export/ExportPdfTest.php @@ -233,7 +233,6 @@ class ExportPdfTest extends AbstractTestCase $this->object->exportData( 'db', 'table', - 'phpmyadmin.net/err', 'SELECT', ), ); diff --git a/tests/unit/Plugins/Export/ExportPhparrayTest.php b/tests/unit/Plugins/Export/ExportPhparrayTest.php index be531f9808..f12327d258 100644 --- a/tests/unit/Plugins/Export/ExportPhparrayTest.php +++ b/tests/unit/Plugins/Export/ExportPhparrayTest.php @@ -173,7 +173,6 @@ class ExportPhparrayTest extends AbstractTestCase $this->object->exportData( 'test_db', 'test_table', - 'phpmyadmin.net/err', 'SELECT * FROM `test_db`.`test_table`;', ), ); @@ -195,7 +194,6 @@ class ExportPhparrayTest extends AbstractTestCase $this->object->exportData( 'test_db', '0`932table', - 'phpmyadmin.net/err', 'SELECT * FROM `test_db`.`test_table`;', ), ); diff --git a/tests/unit/Plugins/Export/ExportSqlTest.php b/tests/unit/Plugins/Export/ExportSqlTest.php index f3c1db2656..d9a74d7736 100644 --- a/tests/unit/Plugins/Export/ExportSqlTest.php +++ b/tests/unit/Plugins/Export/ExportSqlTest.php @@ -1095,7 +1095,7 @@ SQL; $this->object->useSqlBackquotes(true); ob_start(); - $this->object->exportData('db', 'table', 'example.com/err', 'SELECT a FROM b WHERE 1'); + $this->object->exportData('db', 'table', 'SELECT a FROM b WHERE 1'); $result = ob_get_clean(); self::assertIsString($result); @@ -1191,7 +1191,7 @@ SQL; $this->object->useSqlBackquotes(true); ob_start(); - $this->object->exportData('db', 'table', 'example.com/err', 'SELECT a FROM b WHERE 1'); + $this->object->exportData('db', 'table', 'SELECT a FROM b WHERE 1'); $result = ob_get_clean(); self::assertIsString($result); @@ -1234,7 +1234,7 @@ SQL; ob_start(); self::assertTrue( - $this->object->exportData('db', 'tbl', 'err.com', 'SELECT'), + $this->object->exportData('db', 'tbl', 'SELECT'), ); $result = ob_get_clean(); @@ -1279,7 +1279,7 @@ SQL; ob_start(); self::assertTrue( - $this->object->exportData('db', 'table', 'err.com', 'SELECT'), + $this->object->exportData('db', 'table', 'SELECT'), ); $result = ob_get_clean(); diff --git a/tests/unit/Plugins/Export/ExportTexytextTest.php b/tests/unit/Plugins/Export/ExportTexytextTest.php index 1ccd811224..eb45bbd83f 100644 --- a/tests/unit/Plugins/Export/ExportTexytextTest.php +++ b/tests/unit/Plugins/Export/ExportTexytextTest.php @@ -220,7 +220,6 @@ class ExportTexytextTest extends AbstractTestCase $this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', ), ); diff --git a/tests/unit/Plugins/Export/ExportXmlTest.php b/tests/unit/Plugins/Export/ExportXmlTest.php index 04394e1cc6..3ab87ac212 100644 --- a/tests/unit/Plugins/Export/ExportXmlTest.php +++ b/tests/unit/Plugins/Export/ExportXmlTest.php @@ -380,7 +380,6 @@ class ExportXmlTest extends AbstractTestCase $this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table`;', ), ); diff --git a/tests/unit/Plugins/Export/ExportYamlTest.php b/tests/unit/Plugins/Export/ExportYamlTest.php index d9712113ae..a9097f1ed5 100644 --- a/tests/unit/Plugins/Export/ExportYamlTest.php +++ b/tests/unit/Plugins/Export/ExportYamlTest.php @@ -163,7 +163,6 @@ class ExportYamlTest extends AbstractTestCase $this->object->exportData( 'test_db', 'test_table', - 'localhost', 'SELECT * FROM `test_db`.`test_table_yaml`;', ), );