From a2ed4dfe68fb70d080feb3972ec5745b7215db3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 30 Aug 2021 13:16:29 -0300 Subject: [PATCH] Make controllers callable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- js/messages.php | 2 +- .../BrowseForeignersController.php | 2 +- .../Controllers/ChangeLogController.php | 2 +- .../Controllers/CheckRelationsController.php | 2 +- .../classes/Controllers/ColumnController.php | 2 +- .../Database/DataDictionaryController.php | 2 +- .../Database/DesignerController.php | 2 +- .../Controllers/Database/EventsController.php | 2 +- .../Controllers/Database/ImportController.php | 2 +- .../Database/PrivilegesController.php | 2 +- .../Database/QueryByExampleController.php | 2 +- .../Database/RoutinesController.php | 2 +- .../Controllers/Database/SearchController.php | 2 +- .../Database/SqlAutoCompleteController.php | 2 +- .../Controllers/Database/SqlController.php | 2 +- .../Database/SqlFormatController.php | 2 +- .../Database/TrackingController.php | 2 +- .../Database/TriggersController.php | 2 +- .../Controllers/DatabaseController.php | 2 +- .../Controllers/ErrorReportController.php | 2 +- .../Controllers/GisDataEditorController.php | 2 +- .../classes/Controllers/ImportController.php | 2 +- .../Controllers/ImportStatusController.php | 2 +- .../JavaScriptMessagesController.php | 2 +- .../classes/Controllers/LicenseController.php | 2 +- .../classes/Controllers/LintController.php | 2 +- .../classes/Controllers/LogoutController.php | 2 +- .../Controllers/NavigationController.php | 2 +- .../Controllers/NormalizationController.php | 2 +- .../classes/Controllers/PhpInfoController.php | 2 +- .../Preferences/ExportController.php | 2 +- .../Preferences/FeaturesController.php | 2 +- .../Preferences/ImportController.php | 2 +- .../Preferences/MainPanelController.php | 2 +- .../Preferences/ManageController.php | 2 +- .../Preferences/NavigationController.php | 2 +- .../Controllers/Preferences/SqlController.php | 2 +- .../Preferences/TwoFactorController.php | 2 +- .../Controllers/SchemaExportController.php | 2 +- .../Controllers/Server/BinlogController.php | 2 +- .../Server/CollationsController.php | 2 +- .../Controllers/Server/ExportController.php | 2 +- .../Controllers/Server/ImportController.php | 2 +- .../Controllers/Server/PluginsController.php | 2 +- .../Server/PrivilegesController.php | 8 +- .../Server/ReplicationController.php | 2 +- .../Controllers/Server/SqlController.php | 2 +- .../Server/Status/AdvisorController.php | 2 +- .../Server/Status/QueriesController.php | 2 +- .../Server/Status/StatusController.php | 2 +- .../Server/Status/VariablesController.php | 2 +- .../Controllers/Setup/ConfigController.php | 2 +- .../Controllers/Setup/FormController.php | 2 +- .../Controllers/Setup/HomeController.php | 2 +- .../Controllers/Table/AddFieldController.php | 2 +- .../Controllers/Table/ChartController.php | 2 +- .../Controllers/Table/CreateController.php | 2 +- .../DropColumnConfirmationController.php | 2 +- .../Table/DropColumnController.php | 2 +- .../Table/FindReplaceController.php | 2 +- .../Controllers/Table/GetFieldController.php | 2 +- .../Table/GisVisualizationController.php | 2 +- .../Controllers/Table/ImportController.php | 2 +- .../Table/OperationsController.php | 2 +- .../Table/PrivilegesController.php | 2 +- .../Table/RecentFavoriteController.php | 2 +- .../Controllers/Table/RelationController.php | 2 +- .../Controllers/Table/ReplaceController.php | 10 +- .../Controllers/Table/SearchController.php | 2 +- .../Controllers/Table/SqlController.php | 2 +- .../Controllers/Table/TrackingController.php | 2 +- .../Controllers/Table/TriggersController.php | 2 +- .../Table/ZoomSearchController.php | 2 +- .../classes/Controllers/TableController.php | 2 +- .../TransformationOverviewController.php | 2 +- .../TransformationWrapperController.php | 2 +- .../Controllers/UserPasswordController.php | 2 +- .../Controllers/VersionCheckController.php | 2 +- .../Controllers/ViewCreateController.php | 2 +- .../Controllers/ViewOperationsController.php | 2 +- libraries/classes/DbTableExists.php | 2 +- libraries/classes/Export.php | 2 +- libraries/classes/Routing.php | 24 ++- libraries/routes.php | 150 +++++++++--------- setup/index.php | 9 +- .../Database/PrivilegesControllerTest.php | 5 +- .../Controllers/ImportControllerTest.php | 2 +- .../JavaScriptMessagesControllerTest.php | 4 +- .../Controllers/NavigationControllerTest.php | 4 +- .../NormalizationControllerTest.php | 8 +- .../Server/BinlogControllerTest.php | 2 +- .../Server/CollationsControllerTest.php | 2 +- .../Server/PluginsControllerTest.php | 2 +- .../Server/Status/AdvisorControllerTest.php | 4 +- .../Server/Status/QueriesControllerTest.php | 2 +- .../Server/Status/StatusControllerTest.php | 2 +- .../Server/Status/VariablesControllerTest.php | 2 +- .../Table/PrivilegesControllerTest.php | 8 +- .../Table/ReplaceControllerTest.php | 4 +- .../TransformationOverviewControllerTest.php | 2 +- 100 files changed, 211 insertions(+), 203 deletions(-) diff --git a/js/messages.php b/js/messages.php index ab9e828b82..318facc6cd 100644 --- a/js/messages.php +++ b/js/messages.php @@ -64,4 +64,4 @@ register_shutdown_function(static function () { /** @var JavaScriptMessagesController $controller */ $controller = $containerBuilder->get(JavaScriptMessagesController::class); -$controller->index(); +$controller(); diff --git a/libraries/classes/Controllers/BrowseForeignersController.php b/libraries/classes/Controllers/BrowseForeignersController.php index 3d1be11162..f694404753 100644 --- a/libraries/classes/Controllers/BrowseForeignersController.php +++ b/libraries/classes/Controllers/BrowseForeignersController.php @@ -32,7 +32,7 @@ class BrowseForeignersController extends AbstractController $this->relation = $relation; } - public function index(): void + public function __invoke(): void { $params = [ 'db' => $_POST['db'] ?? null, diff --git a/libraries/classes/Controllers/ChangeLogController.php b/libraries/classes/Controllers/ChangeLogController.php index d600a89636..81ed90f78b 100644 --- a/libraries/classes/Controllers/ChangeLogController.php +++ b/libraries/classes/Controllers/ChangeLogController.php @@ -21,7 +21,7 @@ use function substr; class ChangeLogController extends AbstractController { - public function index(): void + public function __invoke(): void { $this->response->disable(); $this->response->getHeader()->sendHttpHeaders(); diff --git a/libraries/classes/Controllers/CheckRelationsController.php b/libraries/classes/Controllers/CheckRelationsController.php index 23e7144d41..776973a310 100644 --- a/libraries/classes/Controllers/CheckRelationsController.php +++ b/libraries/classes/Controllers/CheckRelationsController.php @@ -25,7 +25,7 @@ class CheckRelationsController extends AbstractController $this->relation = $relation; } - public function index(): void + public function __invoke(): void { global $db; diff --git a/libraries/classes/Controllers/ColumnController.php b/libraries/classes/Controllers/ColumnController.php index 17459b477b..177f42740d 100644 --- a/libraries/classes/Controllers/ColumnController.php +++ b/libraries/classes/Controllers/ColumnController.php @@ -24,7 +24,7 @@ final class ColumnController extends AbstractController $this->dbi = $dbi; } - public function all(): void + public function __invoke(): void { if (! isset($_POST['db'], $_POST['table'])) { $this->response->setRequestStatus(false); diff --git a/libraries/classes/Controllers/Database/DataDictionaryController.php b/libraries/classes/Controllers/Database/DataDictionaryController.php index e0189c8fde..86ce0c4621 100644 --- a/libraries/classes/Controllers/Database/DataDictionaryController.php +++ b/libraries/classes/Controllers/Database/DataDictionaryController.php @@ -41,7 +41,7 @@ class DataDictionaryController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { Util::checkParameters(['db'], true); diff --git a/libraries/classes/Controllers/Database/DesignerController.php b/libraries/classes/Controllers/Database/DesignerController.php index 1bf587f952..f732a83546 100644 --- a/libraries/classes/Controllers/Database/DesignerController.php +++ b/libraries/classes/Controllers/Database/DesignerController.php @@ -40,7 +40,7 @@ class DesignerController extends AbstractController $this->designerCommon = $designerCommon; } - public function index(): void + public function __invoke(): void { global $db, $script_display_field, $tab_column, $tables_all_keys, $tables_pk_or_unique_keys; global $success, $page, $message, $display_page, $selected_page, $tab_pos, $fullTableNames, $script_tables; diff --git a/libraries/classes/Controllers/Database/EventsController.php b/libraries/classes/Controllers/Database/EventsController.php index ad51381586..d012d187e3 100644 --- a/libraries/classes/Controllers/Database/EventsController.php +++ b/libraries/classes/Controllers/Database/EventsController.php @@ -33,7 +33,7 @@ final class EventsController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $db, $tables, $num_tables, $total_num_tables, $sub_part, $errors, $text_dir; global $tooltip_truename, $tooltip_aliasname, $pos, $cfg, $errorUrl; diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php index 4c4a68922b..8bedcebcd5 100644 --- a/libraries/classes/Controllers/Database/ImportController.php +++ b/libraries/classes/Controllers/Database/ImportController.php @@ -39,7 +39,7 @@ final class ImportController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $db, $table, $tables, $num_tables, $total_num_tables, $cfg; global $tooltip_truename, $tooltip_aliasname, $pos, $sub_part, $SESSION_KEY, $errorUrl; diff --git a/libraries/classes/Controllers/Database/PrivilegesController.php b/libraries/classes/Controllers/Database/PrivilegesController.php index 11b0adb636..b8e82f8e4a 100644 --- a/libraries/classes/Controllers/Database/PrivilegesController.php +++ b/libraries/classes/Controllers/Database/PrivilegesController.php @@ -39,7 +39,7 @@ class PrivilegesController extends AbstractController /** * @param array $params Request parameters */ - public function index(array $params): string + public function __invoke(array $params): string { global $cfg, $text_dir; diff --git a/libraries/classes/Controllers/Database/QueryByExampleController.php b/libraries/classes/Controllers/Database/QueryByExampleController.php index b5c824919f..d62b14a01d 100644 --- a/libraries/classes/Controllers/Database/QueryByExampleController.php +++ b/libraries/classes/Controllers/Database/QueryByExampleController.php @@ -39,7 +39,7 @@ class QueryByExampleController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $db, $savedSearchList, $savedSearch, $currentSearchId; global $sql_query, $goto, $sub_part, $tables, $num_tables, $total_num_tables; diff --git a/libraries/classes/Controllers/Database/RoutinesController.php b/libraries/classes/Controllers/Database/RoutinesController.php index 47be016ec1..2c8a0e1138 100644 --- a/libraries/classes/Controllers/Database/RoutinesController.php +++ b/libraries/classes/Controllers/Database/RoutinesController.php @@ -40,7 +40,7 @@ class RoutinesController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $db, $table, $tables, $num_tables, $total_num_tables, $sub_part; global $tooltip_truename, $tooltip_aliasname, $pos; diff --git a/libraries/classes/Controllers/Database/SearchController.php b/libraries/classes/Controllers/Database/SearchController.php index 635f54cf2b..f0417b692e 100644 --- a/libraries/classes/Controllers/Database/SearchController.php +++ b/libraries/classes/Controllers/Database/SearchController.php @@ -30,7 +30,7 @@ class SearchController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $cfg, $db, $errorUrl, $urlParams, $tables, $num_tables, $total_num_tables, $sub_part; global $tooltip_truename, $tooltip_aliasname, $pos; diff --git a/libraries/classes/Controllers/Database/SqlAutoCompleteController.php b/libraries/classes/Controllers/Database/SqlAutoCompleteController.php index 6d62675772..0d818058c0 100644 --- a/libraries/classes/Controllers/Database/SqlAutoCompleteController.php +++ b/libraries/classes/Controllers/Database/SqlAutoCompleteController.php @@ -29,7 +29,7 @@ class SqlAutoCompleteController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $cfg, $db, $sql_autocomplete; diff --git a/libraries/classes/Controllers/Database/SqlController.php b/libraries/classes/Controllers/Database/SqlController.php index 86b71fe8f2..142435b40f 100644 --- a/libraries/classes/Controllers/Database/SqlController.php +++ b/libraries/classes/Controllers/Database/SqlController.php @@ -31,7 +31,7 @@ class SqlController extends AbstractController $this->sqlQueryForm = $sqlQueryForm; } - public function index(): void + public function __invoke(): void { global $goto, $back, $db, $cfg, $errorUrl; diff --git a/libraries/classes/Controllers/Database/SqlFormatController.php b/libraries/classes/Controllers/Database/SqlFormatController.php index f1e81ea2d5..218e8b6959 100644 --- a/libraries/classes/Controllers/Database/SqlFormatController.php +++ b/libraries/classes/Controllers/Database/SqlFormatController.php @@ -13,7 +13,7 @@ use function strlen; */ class SqlFormatController extends AbstractController { - public function index(): void + public function __invoke(): void { $params = ['sql' => $_POST['sql'] ?? null]; $query = strlen((string) $params['sql']) > 0 ? $params['sql'] : ''; diff --git a/libraries/classes/Controllers/Database/TrackingController.php b/libraries/classes/Controllers/Database/TrackingController.php index 3fa9ad92cf..4d4acd837c 100644 --- a/libraries/classes/Controllers/Database/TrackingController.php +++ b/libraries/classes/Controllers/Database/TrackingController.php @@ -43,7 +43,7 @@ class TrackingController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $db, $text_dir, $urlParams, $tables, $num_tables; global $total_num_tables, $sub_part, $pos, $data, $cfg; diff --git a/libraries/classes/Controllers/Database/TriggersController.php b/libraries/classes/Controllers/Database/TriggersController.php index 5eba3ae5e8..4e0a0db939 100644 --- a/libraries/classes/Controllers/Database/TriggersController.php +++ b/libraries/classes/Controllers/Database/TriggersController.php @@ -34,7 +34,7 @@ class TriggersController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $db, $table, $tables, $num_tables, $total_num_tables, $sub_part; global $tooltip_truename, $tooltip_aliasname, $pos; diff --git a/libraries/classes/Controllers/DatabaseController.php b/libraries/classes/Controllers/DatabaseController.php index 17e7ae75a3..573dfaa917 100644 --- a/libraries/classes/Controllers/DatabaseController.php +++ b/libraries/classes/Controllers/DatabaseController.php @@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers; final class DatabaseController extends AbstractController { - public function all(): void + public function __invoke(): void { global $dblist; diff --git a/libraries/classes/Controllers/ErrorReportController.php b/libraries/classes/Controllers/ErrorReportController.php index bbc93ec586..3c2273e8e4 100644 --- a/libraries/classes/Controllers/ErrorReportController.php +++ b/libraries/classes/Controllers/ErrorReportController.php @@ -46,7 +46,7 @@ class ErrorReportController extends AbstractController $this->errorHandler = $errorHandler; } - public function index(): void + public function __invoke(): void { global $cfg; diff --git a/libraries/classes/Controllers/GisDataEditorController.php b/libraries/classes/Controllers/GisDataEditorController.php index b5959a74ab..6631d4821e 100644 --- a/libraries/classes/Controllers/GisDataEditorController.php +++ b/libraries/classes/Controllers/GisDataEditorController.php @@ -25,7 +25,7 @@ use function trim; */ class GisDataEditorController extends AbstractController { - public function index(): void + public function __invoke(): void { global $gis_data, $gis_types, $start, $geom_type, $gis_obj, $srid, $wkt, $wkt_with_zero; global $result, $visualizationSettings, $data, $visualization, $open_layers, $geom_count, $dbi; diff --git a/libraries/classes/Controllers/ImportController.php b/libraries/classes/Controllers/ImportController.php index 0c6b611e7a..e442ce77c2 100644 --- a/libraries/classes/Controllers/ImportController.php +++ b/libraries/classes/Controllers/ImportController.php @@ -69,7 +69,7 @@ final class ImportController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $cfg, $collation_connection, $db, $import_type, $table, $goto, $display_query; global $format, $local_import_file, $ajax_reload, $import_text, $sql_query, $message, $errorUrl, $urlParams; diff --git a/libraries/classes/Controllers/ImportStatusController.php b/libraries/classes/Controllers/ImportStatusController.php index 02035bff80..50582b383c 100644 --- a/libraries/classes/Controllers/ImportStatusController.php +++ b/libraries/classes/Controllers/ImportStatusController.php @@ -33,7 +33,7 @@ class ImportStatusController $this->template = $template; } - public function index(): void + public function __invoke(): void { global $SESSION_KEY, $upload_id, $plugins, $timestamp; diff --git a/libraries/classes/Controllers/JavaScriptMessagesController.php b/libraries/classes/Controllers/JavaScriptMessagesController.php index b9738150c5..4851cd066f 100644 --- a/libraries/classes/Controllers/JavaScriptMessagesController.php +++ b/libraries/classes/Controllers/JavaScriptMessagesController.php @@ -23,7 +23,7 @@ final class JavaScriptMessagesController $this->setMessages(); } - public function index(): void + public function __invoke(): void { echo 'var Messages = ' . json_encode($this->messages) . ';'; } diff --git a/libraries/classes/Controllers/LicenseController.php b/libraries/classes/Controllers/LicenseController.php index 125784e978..4235ec48d5 100644 --- a/libraries/classes/Controllers/LicenseController.php +++ b/libraries/classes/Controllers/LicenseController.php @@ -17,7 +17,7 @@ use function readfile; */ class LicenseController extends AbstractController { - public function index(): void + public function __invoke(): void { $this->response->disable(); $this->response->header('Content-type: text/plain; charset=utf-8'); diff --git a/libraries/classes/Controllers/LintController.php b/libraries/classes/Controllers/LintController.php index a10350ef7b..52790c17e6 100644 --- a/libraries/classes/Controllers/LintController.php +++ b/libraries/classes/Controllers/LintController.php @@ -17,7 +17,7 @@ use function json_encode; */ class LintController extends AbstractController { - public function index(): void + public function __invoke(): void { $params = [ 'sql_query' => $_POST['sql_query'] ?? null, diff --git a/libraries/classes/Controllers/LogoutController.php b/libraries/classes/Controllers/LogoutController.php index a814cf62d9..5050e42d1b 100644 --- a/libraries/classes/Controllers/LogoutController.php +++ b/libraries/classes/Controllers/LogoutController.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Core; class LogoutController { - public function index(): void + public function __invoke(): void { global $auth_plugin, $token_mismatch; diff --git a/libraries/classes/Controllers/NavigationController.php b/libraries/classes/Controllers/NavigationController.php index bc9a2a9a8b..a793667d69 100644 --- a/libraries/classes/Controllers/NavigationController.php +++ b/libraries/classes/Controllers/NavigationController.php @@ -41,7 +41,7 @@ class NavigationController extends AbstractController $this->relation = $relation; } - public function index(): void + public function __invoke(): void { if (! $this->response->isAjax()) { $this->response->addHTML( diff --git a/libraries/classes/Controllers/NormalizationController.php b/libraries/classes/Controllers/NormalizationController.php index 630d8d8ea4..911319351b 100644 --- a/libraries/classes/Controllers/NormalizationController.php +++ b/libraries/classes/Controllers/NormalizationController.php @@ -34,7 +34,7 @@ class NormalizationController extends AbstractController $this->normalization = $normalization; } - public function index(): void + public function __invoke(): void { global $db, $table; diff --git a/libraries/classes/Controllers/PhpInfoController.php b/libraries/classes/Controllers/PhpInfoController.php index 336f4c61f2..b1924c5adc 100644 --- a/libraries/classes/Controllers/PhpInfoController.php +++ b/libraries/classes/Controllers/PhpInfoController.php @@ -18,7 +18,7 @@ use const INFO_MODULES; */ class PhpInfoController extends AbstractController { - public function index(): void + public function __invoke(): void { global $cfg; diff --git a/libraries/classes/Controllers/Preferences/ExportController.php b/libraries/classes/Controllers/Preferences/ExportController.php index eb51d722d6..33366cb3a7 100644 --- a/libraries/classes/Controllers/Preferences/ExportController.php +++ b/libraries/classes/Controllers/Preferences/ExportController.php @@ -45,7 +45,7 @@ class ExportController extends AbstractController $this->config = $config; } - public function index(): void + public function __invoke(): void { global $cfg, $cf, $error, $tabHash, $hash, $server, $route; diff --git a/libraries/classes/Controllers/Preferences/FeaturesController.php b/libraries/classes/Controllers/Preferences/FeaturesController.php index 49f6f95970..a96d6b5981 100644 --- a/libraries/classes/Controllers/Preferences/FeaturesController.php +++ b/libraries/classes/Controllers/Preferences/FeaturesController.php @@ -45,7 +45,7 @@ class FeaturesController extends AbstractController $this->config = $config; } - public function index(): void + public function __invoke(): void { global $cfg, $cf, $error, $tabHash, $hash, $server, $route; diff --git a/libraries/classes/Controllers/Preferences/ImportController.php b/libraries/classes/Controllers/Preferences/ImportController.php index 60e90b08fd..bc230ccd36 100644 --- a/libraries/classes/Controllers/Preferences/ImportController.php +++ b/libraries/classes/Controllers/Preferences/ImportController.php @@ -45,7 +45,7 @@ class ImportController extends AbstractController $this->config = $config; } - public function index(): void + public function __invoke(): void { global $cfg, $cf, $error, $tabHash, $hash, $server, $route; diff --git a/libraries/classes/Controllers/Preferences/MainPanelController.php b/libraries/classes/Controllers/Preferences/MainPanelController.php index cdf7ebde32..f5a54a2a91 100644 --- a/libraries/classes/Controllers/Preferences/MainPanelController.php +++ b/libraries/classes/Controllers/Preferences/MainPanelController.php @@ -45,7 +45,7 @@ class MainPanelController extends AbstractController $this->config = $config; } - public function index(): void + public function __invoke(): void { global $cfg, $cf, $error, $tabHash, $hash, $server, $route; diff --git a/libraries/classes/Controllers/Preferences/ManageController.php b/libraries/classes/Controllers/Preferences/ManageController.php index 948df7d1ea..d8741a45c1 100644 --- a/libraries/classes/Controllers/Preferences/ManageController.php +++ b/libraries/classes/Controllers/Preferences/ManageController.php @@ -67,7 +67,7 @@ class ManageController extends AbstractController $this->config = $config; } - public function index(): void + public function __invoke(): void { global $cf, $error, $filename, $json, $lang; global $new_config, $return_url, $form_display, $all_ok, $params, $query, $route; diff --git a/libraries/classes/Controllers/Preferences/NavigationController.php b/libraries/classes/Controllers/Preferences/NavigationController.php index 3911266719..1800c66844 100644 --- a/libraries/classes/Controllers/Preferences/NavigationController.php +++ b/libraries/classes/Controllers/Preferences/NavigationController.php @@ -45,7 +45,7 @@ class NavigationController extends AbstractController $this->config = $config; } - public function index(): void + public function __invoke(): void { global $cfg, $cf, $error, $tabHash, $hash, $server, $route; diff --git a/libraries/classes/Controllers/Preferences/SqlController.php b/libraries/classes/Controllers/Preferences/SqlController.php index 0b51dd06b4..3f0101245a 100644 --- a/libraries/classes/Controllers/Preferences/SqlController.php +++ b/libraries/classes/Controllers/Preferences/SqlController.php @@ -45,7 +45,7 @@ class SqlController extends AbstractController $this->config = $config; } - public function index(): void + public function __invoke(): void { global $cfg, $cf, $error, $tabHash, $hash, $server, $route; diff --git a/libraries/classes/Controllers/Preferences/TwoFactorController.php b/libraries/classes/Controllers/Preferences/TwoFactorController.php index e7cb6b1e8a..622a2613e3 100644 --- a/libraries/classes/Controllers/Preferences/TwoFactorController.php +++ b/libraries/classes/Controllers/Preferences/TwoFactorController.php @@ -28,7 +28,7 @@ class TwoFactorController extends AbstractController $this->relation = $relation; } - public function index(): void + public function __invoke(): void { global $cfg, $route; diff --git a/libraries/classes/Controllers/SchemaExportController.php b/libraries/classes/Controllers/SchemaExportController.php index 82c5241c22..f6a3e2f1ea 100644 --- a/libraries/classes/Controllers/SchemaExportController.php +++ b/libraries/classes/Controllers/SchemaExportController.php @@ -29,7 +29,7 @@ class SchemaExportController $this->relation = $relation; } - public function index(): void + public function __invoke(): void { global $cfgRelation; diff --git a/libraries/classes/Controllers/Server/BinlogController.php b/libraries/classes/Controllers/Server/BinlogController.php index 60b5b6818a..5e90f2fb07 100644 --- a/libraries/classes/Controllers/Server/BinlogController.php +++ b/libraries/classes/Controllers/Server/BinlogController.php @@ -48,7 +48,7 @@ class BinlogController extends AbstractController ); } - public function index(): void + public function __invoke(): void { global $cfg, $errorUrl; diff --git a/libraries/classes/Controllers/Server/CollationsController.php b/libraries/classes/Controllers/Server/CollationsController.php index 8b83e25280..c0bb245b38 100644 --- a/libraries/classes/Controllers/Server/CollationsController.php +++ b/libraries/classes/Controllers/Server/CollationsController.php @@ -49,7 +49,7 @@ class CollationsController extends AbstractController $this->collations = $collations ?? Charsets::getCollations($this->dbi, $cfg['Server']['DisableIS']); } - public function index(): void + public function __invoke(): void { global $errorUrl; diff --git a/libraries/classes/Controllers/Server/ExportController.php b/libraries/classes/Controllers/Server/ExportController.php index 254b2ee6f8..74b13e1d9e 100644 --- a/libraries/classes/Controllers/Server/ExportController.php +++ b/libraries/classes/Controllers/Server/ExportController.php @@ -36,7 +36,7 @@ final class ExportController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $db, $table, $sql_query, $num_tables, $unlim_num_rows; global $tmp_select, $select_item, $errorUrl; diff --git a/libraries/classes/Controllers/Server/ImportController.php b/libraries/classes/Controllers/Server/ImportController.php index b63d076dd3..fa26449f06 100644 --- a/libraries/classes/Controllers/Server/ImportController.php +++ b/libraries/classes/Controllers/Server/ImportController.php @@ -39,7 +39,7 @@ final class ImportController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $db, $table, $SESSION_KEY, $cfg, $errorUrl; diff --git a/libraries/classes/Controllers/Server/PluginsController.php b/libraries/classes/Controllers/Server/PluginsController.php index 9545c914e9..9b8098afcc 100644 --- a/libraries/classes/Controllers/Server/PluginsController.php +++ b/libraries/classes/Controllers/Server/PluginsController.php @@ -38,7 +38,7 @@ class PluginsController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $errorUrl; diff --git a/libraries/classes/Controllers/Server/PrivilegesController.php b/libraries/classes/Controllers/Server/PrivilegesController.php index 22eaedec7b..82449f3b0b 100644 --- a/libraries/classes/Controllers/Server/PrivilegesController.php +++ b/libraries/classes/Controllers/Server/PrivilegesController.php @@ -53,7 +53,7 @@ class PrivilegesController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $db, $table, $errorUrl, $message, $text_dir, $post_patterns; global $username, $hostname, $dbname, $tablename, $routinename, $db_and_table, $dbname_is_wildcard; @@ -413,7 +413,7 @@ class PrivilegesController extends AbstractController ); } elseif (isset($_GET['checkprivsdb'])) { if (isset($_GET['checkprivstable'])) { - $this->response->addHTML($tableController->index([ + $this->response->addHTML($tableController([ 'checkprivsdb' => strtolower($_GET['checkprivsdb']), 'checkprivstable' => $_GET['checkprivstable'], ])); @@ -424,9 +424,7 @@ class PrivilegesController extends AbstractController return; } else { - $this->response->addHTML($databaseController->index([ - 'checkprivsdb' => strtolower($_GET['checkprivsdb']), - ])); + $this->response->addHTML($databaseController(['checkprivsdb' => strtolower($_GET['checkprivsdb'])])); $this->render('export_modal'); } } else { diff --git a/libraries/classes/Controllers/Server/ReplicationController.php b/libraries/classes/Controllers/Server/ReplicationController.php index 8a2cddda20..043c3944a3 100644 --- a/libraries/classes/Controllers/Server/ReplicationController.php +++ b/libraries/classes/Controllers/Server/ReplicationController.php @@ -39,7 +39,7 @@ class ReplicationController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $urlParams, $errorUrl; diff --git a/libraries/classes/Controllers/Server/SqlController.php b/libraries/classes/Controllers/Server/SqlController.php index b14837e588..41c0a9395b 100644 --- a/libraries/classes/Controllers/Server/SqlController.php +++ b/libraries/classes/Controllers/Server/SqlController.php @@ -34,7 +34,7 @@ class SqlController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $errorUrl; diff --git a/libraries/classes/Controllers/Server/Status/AdvisorController.php b/libraries/classes/Controllers/Server/Status/AdvisorController.php index 1b9f1a00ac..033d82ef07 100644 --- a/libraries/classes/Controllers/Server/Status/AdvisorController.php +++ b/libraries/classes/Controllers/Server/Status/AdvisorController.php @@ -27,7 +27,7 @@ class AdvisorController extends AbstractController $this->advisor = $advisor; } - public function index(): void + public function __invoke(): void { $data = []; if ($this->data->dataLoaded) { diff --git a/libraries/classes/Controllers/Server/Status/QueriesController.php b/libraries/classes/Controllers/Server/Status/QueriesController.php index 1fce33f0e5..3f31599460 100644 --- a/libraries/classes/Controllers/Server/Status/QueriesController.php +++ b/libraries/classes/Controllers/Server/Status/QueriesController.php @@ -35,7 +35,7 @@ class QueriesController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $errorUrl; diff --git a/libraries/classes/Controllers/Server/Status/StatusController.php b/libraries/classes/Controllers/Server/Status/StatusController.php index 1fee57fe5d..a42d58dd22 100644 --- a/libraries/classes/Controllers/Server/Status/StatusController.php +++ b/libraries/classes/Controllers/Server/Status/StatusController.php @@ -38,7 +38,7 @@ class StatusController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $errorUrl; diff --git a/libraries/classes/Controllers/Server/Status/VariablesController.php b/libraries/classes/Controllers/Server/Status/VariablesController.php index d70194172a..bc2042e64e 100644 --- a/libraries/classes/Controllers/Server/Status/VariablesController.php +++ b/libraries/classes/Controllers/Server/Status/VariablesController.php @@ -35,7 +35,7 @@ class VariablesController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $errorUrl; diff --git a/libraries/classes/Controllers/Setup/ConfigController.php b/libraries/classes/Controllers/Setup/ConfigController.php index 07cfbd245d..2e6db1627f 100644 --- a/libraries/classes/Controllers/Setup/ConfigController.php +++ b/libraries/classes/Controllers/Setup/ConfigController.php @@ -14,7 +14,7 @@ class ConfigController extends AbstractController * * @return string HTML */ - public function index(array $params): string + public function __invoke(array $params): string { $pages = $this->getPages(); diff --git a/libraries/classes/Controllers/Setup/FormController.php b/libraries/classes/Controllers/Setup/FormController.php index 956015e9a6..d68a1eabe2 100644 --- a/libraries/classes/Controllers/Setup/FormController.php +++ b/libraries/classes/Controllers/Setup/FormController.php @@ -20,7 +20,7 @@ class FormController extends AbstractController * * @return string HTML */ - public function index(array $params): string + public function __invoke(array $params): string { $pages = $this->getPages(); diff --git a/libraries/classes/Controllers/Setup/HomeController.php b/libraries/classes/Controllers/Setup/HomeController.php index 9dadcff686..5a96ccdeff 100644 --- a/libraries/classes/Controllers/Setup/HomeController.php +++ b/libraries/classes/Controllers/Setup/HomeController.php @@ -21,7 +21,7 @@ class HomeController extends AbstractController * * @return string HTML */ - public function index(array $params): string + public function __invoke(array $params): string { $pages = $this->getPages(); diff --git a/libraries/classes/Controllers/Table/AddFieldController.php b/libraries/classes/Controllers/Table/AddFieldController.php index 4a7de633b5..9f3d8746fb 100644 --- a/libraries/classes/Controllers/Table/AddFieldController.php +++ b/libraries/classes/Controllers/Table/AddFieldController.php @@ -65,7 +65,7 @@ class AddFieldController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $errorUrl, $message, $action, $active_page, $sql_query; global $num_fields, $regenerate, $result, $db, $table; diff --git a/libraries/classes/Controllers/Table/ChartController.php b/libraries/classes/Controllers/Table/ChartController.php index ec6d76ff22..2baf8e2fe9 100644 --- a/libraries/classes/Controllers/Table/ChartController.php +++ b/libraries/classes/Controllers/Table/ChartController.php @@ -44,7 +44,7 @@ class ChartController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $db, $table, $cfg, $sql_query, $errorUrl; diff --git a/libraries/classes/Controllers/Table/CreateController.php b/libraries/classes/Controllers/Table/CreateController.php index fd7558e72f..009ed0395d 100644 --- a/libraries/classes/Controllers/Table/CreateController.php +++ b/libraries/classes/Controllers/Table/CreateController.php @@ -64,7 +64,7 @@ class CreateController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $num_fields, $action, $sql_query, $result, $db, $table; diff --git a/libraries/classes/Controllers/Table/DropColumnConfirmationController.php b/libraries/classes/Controllers/Table/DropColumnConfirmationController.php index 241d80f602..1e7ca25b07 100644 --- a/libraries/classes/Controllers/Table/DropColumnConfirmationController.php +++ b/libraries/classes/Controllers/Table/DropColumnConfirmationController.php @@ -12,7 +12,7 @@ use function __; final class DropColumnConfirmationController extends AbstractController { - public function process(): void + public function __invoke(): void { global $urlParams, $errorUrl, $cfg; diff --git a/libraries/classes/Controllers/Table/DropColumnController.php b/libraries/classes/Controllers/Table/DropColumnController.php index 7dec66edfc..18346d9911 100644 --- a/libraries/classes/Controllers/Table/DropColumnController.php +++ b/libraries/classes/Controllers/Table/DropColumnController.php @@ -48,7 +48,7 @@ final class DropColumnController extends AbstractController $this->relationCleanup = $relationCleanup; } - public function process(): void + public function __invoke(): void { $selected = $_POST['selected'] ?? []; diff --git a/libraries/classes/Controllers/Table/FindReplaceController.php b/libraries/classes/Controllers/Table/FindReplaceController.php index d35184dd4e..a9a6e2803f 100644 --- a/libraries/classes/Controllers/Table/FindReplaceController.php +++ b/libraries/classes/Controllers/Table/FindReplaceController.php @@ -62,7 +62,7 @@ class FindReplaceController extends AbstractController ); } - public function index(): void + public function __invoke(): void { global $db, $table, $urlParams, $cfg, $errorUrl; diff --git a/libraries/classes/Controllers/Table/GetFieldController.php b/libraries/classes/Controllers/Table/GetFieldController.php index d089a19de7..a48d8916be 100644 --- a/libraries/classes/Controllers/Table/GetFieldController.php +++ b/libraries/classes/Controllers/Table/GetFieldController.php @@ -38,7 +38,7 @@ class GetFieldController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $db, $table; diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index 0c9bacc4b8..529c2da069 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -40,7 +40,7 @@ final class GisVisualizationController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $cfg, $urlParams, $db, $errorUrl; diff --git a/libraries/classes/Controllers/Table/ImportController.php b/libraries/classes/Controllers/Table/ImportController.php index 481cf27ef6..f05a21e1af 100644 --- a/libraries/classes/Controllers/Table/ImportController.php +++ b/libraries/classes/Controllers/Table/ImportController.php @@ -41,7 +41,7 @@ final class ImportController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $db, $table, $urlParams, $SESSION_KEY, $cfg, $errorUrl; diff --git a/libraries/classes/Controllers/Table/OperationsController.php b/libraries/classes/Controllers/Table/OperationsController.php index fcd39d380d..043f142b31 100644 --- a/libraries/classes/Controllers/Table/OperationsController.php +++ b/libraries/classes/Controllers/Table/OperationsController.php @@ -69,7 +69,7 @@ class OperationsController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $urlParams, $reread_info, $tbl_is_view, $tbl_storage_engine; global $show_comment, $tbl_collation, $table_info_num_rows, $row_format, $auto_increment, $create_options; diff --git a/libraries/classes/Controllers/Table/PrivilegesController.php b/libraries/classes/Controllers/Table/PrivilegesController.php index 3921ec03d7..11e95b1f2e 100644 --- a/libraries/classes/Controllers/Table/PrivilegesController.php +++ b/libraries/classes/Controllers/Table/PrivilegesController.php @@ -40,7 +40,7 @@ class PrivilegesController extends AbstractController /** * @param array $params Request parameters */ - public function index(array $params): string + public function __invoke(array $params): string { global $cfg, $text_dir; diff --git a/libraries/classes/Controllers/Table/RecentFavoriteController.php b/libraries/classes/Controllers/Table/RecentFavoriteController.php index 10c32ac941..71b1e3188f 100644 --- a/libraries/classes/Controllers/Table/RecentFavoriteController.php +++ b/libraries/classes/Controllers/Table/RecentFavoriteController.php @@ -12,7 +12,7 @@ use PhpMyAdmin\RecentFavoriteTable; */ class RecentFavoriteController extends AbstractController { - public function index(): void + public function __invoke(): void { global $containerBuilder; diff --git a/libraries/classes/Controllers/Table/RelationController.php b/libraries/classes/Controllers/Table/RelationController.php index 10a7b938f2..6cca9de7fe 100644 --- a/libraries/classes/Controllers/Table/RelationController.php +++ b/libraries/classes/Controllers/Table/RelationController.php @@ -61,7 +61,7 @@ final class RelationController extends AbstractController /** * Index */ - public function index(): void + public function __invoke(): void { global $route; diff --git a/libraries/classes/Controllers/Table/ReplaceController.php b/libraries/classes/Controllers/Table/ReplaceController.php index 49ff211fb7..f8fc83ee1e 100644 --- a/libraries/classes/Controllers/Table/ReplaceController.php +++ b/libraries/classes/Controllers/Table/ReplaceController.php @@ -73,7 +73,7 @@ final class ReplaceController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $containerBuilder, $db, $table, $urlParams, $message; global $errorUrl, $mime_map, $unsaved_values, $active_page, $disp_query, $disp_message; @@ -446,7 +446,7 @@ final class ReplaceController extends AbstractController if ($goto_include === '/database/sql') { /** @var DatabaseSqlController $controller */ $controller = $containerBuilder->get(DatabaseSqlController::class); - $controller->index(); + $controller(); return; } @@ -462,7 +462,7 @@ final class ReplaceController extends AbstractController if ($goto_include === '/table/sql') { /** @var TableSqlController $controller */ $controller = $containerBuilder->get(TableSqlController::class); - $controller->index(); + $controller(); return; } @@ -664,7 +664,7 @@ final class ReplaceController extends AbstractController if ($goto_include === '/database/sql') { /** @var DatabaseSqlController $controller */ $controller = $containerBuilder->get(DatabaseSqlController::class); - $controller->index(); + $controller(); return; } @@ -680,7 +680,7 @@ final class ReplaceController extends AbstractController if ($goto_include === '/table/sql') { /** @var TableSqlController $controller */ $controller = $containerBuilder->get(TableSqlController::class); - $controller->index(); + $controller(); return; } diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php index f07ea21496..c367b0492e 100644 --- a/libraries/classes/Controllers/Table/SearchController.php +++ b/libraries/classes/Controllers/Table/SearchController.php @@ -191,7 +191,7 @@ class SearchController extends AbstractController /** * Index action */ - public function index(): void + public function __invoke(): void { global $db, $table, $urlParams, $cfg, $errorUrl; diff --git a/libraries/classes/Controllers/Table/SqlController.php b/libraries/classes/Controllers/Table/SqlController.php index e61932d2d8..e4775fcc6a 100644 --- a/libraries/classes/Controllers/Table/SqlController.php +++ b/libraries/classes/Controllers/Table/SqlController.php @@ -33,7 +33,7 @@ final class SqlController extends AbstractController $this->sqlQueryForm = $sqlQueryForm; } - public function index(): void + public function __invoke(): void { global $errorUrl, $goto, $back, $db, $table, $cfg; diff --git a/libraries/classes/Controllers/Table/TrackingController.php b/libraries/classes/Controllers/Table/TrackingController.php index fe29a71731..a32074de12 100644 --- a/libraries/classes/Controllers/Table/TrackingController.php +++ b/libraries/classes/Controllers/Table/TrackingController.php @@ -42,7 +42,7 @@ final class TrackingController extends AbstractController $this->tracking = $tracking; } - public function index(): void + public function __invoke(): void { global $text_dir, $urlParams, $msg, $errorUrl; global $data, $entries, $filter_ts_from, $filter_ts_to, $filter_users, $selection_schema; diff --git a/libraries/classes/Controllers/Table/TriggersController.php b/libraries/classes/Controllers/Table/TriggersController.php index ee754e8cb2..a80558e5e4 100644 --- a/libraries/classes/Controllers/Table/TriggersController.php +++ b/libraries/classes/Controllers/Table/TriggersController.php @@ -35,7 +35,7 @@ class TriggersController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $db, $table, $tables, $num_tables, $total_num_tables, $sub_part; global $tooltip_truename, $tooltip_aliasname, $pos; diff --git a/libraries/classes/Controllers/Table/ZoomSearchController.php b/libraries/classes/Controllers/Table/ZoomSearchController.php index d45a10d301..e9725bcad5 100644 --- a/libraries/classes/Controllers/Table/ZoomSearchController.php +++ b/libraries/classes/Controllers/Table/ZoomSearchController.php @@ -91,7 +91,7 @@ class ZoomSearchController extends AbstractController $this->loadTableInfo(); } - public function index(): void + public function __invoke(): void { global $goto, $db, $table, $urlParams, $cfg, $errorUrl; diff --git a/libraries/classes/Controllers/TableController.php b/libraries/classes/Controllers/TableController.php index 6251320f64..e39f847149 100644 --- a/libraries/classes/Controllers/TableController.php +++ b/libraries/classes/Controllers/TableController.php @@ -24,7 +24,7 @@ final class TableController extends AbstractController $this->dbi = $dbi; } - public function all(): void + public function __invoke(): void { if (! isset($_POST['db'])) { $this->response->setRequestStatus(false); diff --git a/libraries/classes/Controllers/TransformationOverviewController.php b/libraries/classes/Controllers/TransformationOverviewController.php index e225a8b4d3..01eace769d 100644 --- a/libraries/classes/Controllers/TransformationOverviewController.php +++ b/libraries/classes/Controllers/TransformationOverviewController.php @@ -28,7 +28,7 @@ class TransformationOverviewController extends AbstractController $this->transformations = $transformations; } - public function index(): void + public function __invoke(): void { $header = $this->response->getHeader(); $header->disableMenuAndConsole(); diff --git a/libraries/classes/Controllers/TransformationWrapperController.php b/libraries/classes/Controllers/TransformationWrapperController.php index c890da4045..eaa7b56cca 100644 --- a/libraries/classes/Controllers/TransformationWrapperController.php +++ b/libraries/classes/Controllers/TransformationWrapperController.php @@ -55,7 +55,7 @@ class TransformationWrapperController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $cn, $db, $table, $transform_key, $request_params, $size_params, $where_clause, $row; global $default_ct, $mime_map, $mime_options, $ct, $mime_type, $srcImage, $srcWidth, $srcHeight; diff --git a/libraries/classes/Controllers/UserPasswordController.php b/libraries/classes/Controllers/UserPasswordController.php index c52763f680..58e00cfd65 100644 --- a/libraries/classes/Controllers/UserPasswordController.php +++ b/libraries/classes/Controllers/UserPasswordController.php @@ -35,7 +35,7 @@ class UserPasswordController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $cfg, $hostname, $username, $password, $change_password_message, $msg; diff --git a/libraries/classes/Controllers/VersionCheckController.php b/libraries/classes/Controllers/VersionCheckController.php index fb8c81bc07..e1dc364606 100644 --- a/libraries/classes/Controllers/VersionCheckController.php +++ b/libraries/classes/Controllers/VersionCheckController.php @@ -14,7 +14,7 @@ use function json_encode; */ class VersionCheckController extends AbstractController { - public function index(): void + public function __invoke(): void { $_GET['ajax_request'] = 'true'; diff --git a/libraries/classes/Controllers/ViewCreateController.php b/libraries/classes/Controllers/ViewCreateController.php index 292f52a552..e7c814c4b3 100644 --- a/libraries/classes/Controllers/ViewCreateController.php +++ b/libraries/classes/Controllers/ViewCreateController.php @@ -45,7 +45,7 @@ class ViewCreateController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $text_dir, $urlParams, $view_algorithm_options, $view_with_options, $view_security_options; global $message, $sep, $sql_query, $arr, $view_columns, $column_map, $systemDb, $pma_transformation_data; diff --git a/libraries/classes/Controllers/ViewOperationsController.php b/libraries/classes/Controllers/ViewOperationsController.php index e7bed091ba..e0a3bf8e67 100644 --- a/libraries/classes/Controllers/ViewOperationsController.php +++ b/libraries/classes/Controllers/ViewOperationsController.php @@ -38,7 +38,7 @@ class ViewOperationsController extends AbstractController $this->dbi = $dbi; } - public function index(): void + public function __invoke(): void { global $sql_query, $urlParams, $reload, $result, $warning_messages; global $db, $table, $cfg, $errorUrl; diff --git a/libraries/classes/DbTableExists.php b/libraries/classes/DbTableExists.php index e676085beb..b966a1ca9f 100644 --- a/libraries/classes/DbTableExists.php +++ b/libraries/classes/DbTableExists.php @@ -125,7 +125,7 @@ final class DbTableExists /** @var SqlController $controller */ $controller = $containerBuilder->get(SqlController::class); - $controller->index(); + $controller(); exit; } diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php index 15c211c390..eb62341368 100644 --- a/libraries/classes/Export.php +++ b/libraries/classes/Export.php @@ -1232,7 +1232,7 @@ class Export $active_page = Url::getFromRoute('/server/export'); /** @var ServerExportController $controller */ $controller = $containerBuilder->get(ServerExportController::class); - $controller->index(); + $controller(); return; } diff --git a/libraries/classes/Routing.php b/libraries/classes/Routing.php index 7acd2ab5a3..18a5b51f8a 100644 --- a/libraries/classes/Routing.php +++ b/libraries/classes/Routing.php @@ -9,6 +9,7 @@ use FastRoute\Dispatcher; use FastRoute\Dispatcher\GroupCountBased as DispatcherGroupCountBased; use FastRoute\RouteCollector; use FastRoute\RouteParser\Std as RouteParserStd; +use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Http\ServerRequest; use Psr\Container\ContainerInterface; use RuntimeException; @@ -19,6 +20,7 @@ use function file_put_contents; use function htmlspecialchars; use function is_array; use function is_readable; +use function is_string; use function is_writable; use function mb_strlen; use function rawurldecode; @@ -175,8 +177,26 @@ class Routing return; } - [$controllerName, $action] = $routeInfo[1]; + /** @psalm-var class-string|callable-array $handler */ + $handler = $routeInfo[1]; + /** @var array $vars */ + $vars = $routeInfo[2]; + + if (is_string($handler)) { + $controllerName = $handler; + /** @psalm-var callable(ServerRequest=, array=):void $controller */ + $controller = $container->get($controllerName); + $controller($request, $vars); + + return; + } + + /** @psalm-var class-string $controllerName */ + $controllerName = $handler[0]; + /** @var string $action */ + $action = $handler[1]; + /** @var AbstractController $controller */ $controller = $container->get($controllerName); - $controller->$action($request, $routeInfo[2]); + $controller->$action($request, $vars); } } diff --git a/libraries/routes.php b/libraries/routes.php index 73b03133e6..a3b61db272 100644 --- a/libraries/routes.php +++ b/libraries/routes.php @@ -114,10 +114,10 @@ return static function (RouteCollector $routes): void { $routes->addRoute(['GET', 'POST'], '/recent-table', [HomeController::class, 'reloadRecentTablesList']); $routes->addRoute(['GET', 'POST'], '/git-revision', [HomeController::class, 'gitRevision']); }); - $routes->addRoute(['GET', 'POST'], '/browse-foreigners', [BrowseForeignersController::class, 'index']); - $routes->get('/changelog', [ChangeLogController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/check-relations', [CheckRelationsController::class, 'index']); - $routes->post('/columns', [ColumnController::class, 'all']); + $routes->addRoute(['GET', 'POST'], '/browse-foreigners', BrowseForeignersController::class); + $routes->get('/changelog', ChangeLogController::class); + $routes->addRoute(['GET', 'POST'], '/check-relations', CheckRelationsController::class); + $routes->post('/columns', ColumnController::class); $routes->addGroup('/config', static function (RouteCollector $routes): void { $routes->post('/get', [ConfigController::class, 'get']); $routes->post('/set', [ConfigController::class, 'set']); @@ -127,11 +127,11 @@ return static function (RouteCollector $routes): void { $routes->addRoute(['GET', 'POST'], '', [CentralColumnsController::class, 'index']); $routes->post('/populate', [CentralColumnsController::class, 'populateColumns']); }); - $routes->get('/data-dictionary', [DataDictionaryController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/designer', [DesignerController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/events', [EventsController::class, 'index']); + $routes->get('/data-dictionary', DataDictionaryController::class); + $routes->addRoute(['GET', 'POST'], '/designer', DesignerController::class); + $routes->addRoute(['GET', 'POST'], '/events', EventsController::class); $routes->addRoute(['GET', 'POST'], '/export', [DatabaseExportController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/import', [DatabaseImportController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/import', DatabaseImportController::class); $routes->addGroup('/multi-table-query', static function (RouteCollector $routes): void { $routes->get('', [MultiTableQueryController::class, 'index']); $routes->get('/tables', [MultiTableQueryController::class, 'table']); @@ -141,13 +141,13 @@ return static function (RouteCollector $routes): void { $routes->addRoute(['GET', 'POST'], '', [OperationsController::class, 'index']); $routes->post('/collation', [OperationsController::class, 'collation']); }); - $routes->addRoute(['GET', 'POST'], '/qbe', [QueryByExampleController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/routines', [RoutinesController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/search', [SearchController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/qbe', QueryByExampleController::class); + $routes->addRoute(['GET', 'POST'], '/routines', RoutinesController::class); + $routes->addRoute(['GET', 'POST'], '/search', SearchController::class); $routes->addGroup('/sql', static function (RouteCollector $routes): void { - $routes->addRoute(['GET', 'POST'], '', [DatabaseSqlController::class, 'index']); - $routes->post('/autocomplete', [SqlAutoCompleteController::class, 'index']); - $routes->post('/format', [SqlFormatController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '', DatabaseSqlController::class); + $routes->post('/autocomplete', SqlAutoCompleteController::class); + $routes->post('/format', SqlFormatController::class); }); $routes->addGroup('/structure', static function (RouteCollector $routes): void { $routes->addRoute(['GET', 'POST'], '', [StructureController::class, 'index']); @@ -178,11 +178,11 @@ return static function (RouteCollector $routes): void { $routes->post('/replace-prefix', [StructureController::class, 'replacePrefix']); $routes->post('/show-create', [StructureController::class, 'showCreate']); }); - $routes->addRoute(['GET', 'POST'], '/tracking', [TrackingController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/triggers', [TriggersController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/tracking', TrackingController::class); + $routes->addRoute(['GET', 'POST'], '/triggers', TriggersController::class); }); - $routes->post('/databases', [DatabaseController::class, 'all']); - $routes->addRoute(['GET', 'POST'], '/error-report', [ErrorReportController::class, 'index']); + $routes->post('/databases', DatabaseController::class); + $routes->addRoute(['GET', 'POST'], '/error-report', ErrorReportController::class); $routes->addGroup('/export', static function (RouteCollector $routes): void { $routes->addRoute(['GET', 'POST'], '', [ExportController::class, 'index']); $routes->get('/check-time-out', [ExportController::class, 'checkTimeOut']); @@ -194,29 +194,29 @@ return static function (RouteCollector $routes): void { $routes->post('/update', [ExportTemplateController::class, 'update']); }); }); - $routes->addRoute(['GET', 'POST'], '/gis-data-editor', [GisDataEditorController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/import', [ImportController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/import-status', [ImportStatusController::class, 'index']); - $routes->get('/license', [LicenseController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/lint', [LintController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/logout', [LogoutController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/navigation', [NavigationController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/normalization', [NormalizationController::class, 'index']); - $routes->get('/phpinfo', [PhpInfoController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/gis-data-editor', GisDataEditorController::class); + $routes->addRoute(['GET', 'POST'], '/import', ImportController::class); + $routes->addRoute(['GET', 'POST'], '/import-status', ImportStatusController::class); + $routes->get('/license', LicenseController::class); + $routes->addRoute(['GET', 'POST'], '/lint', LintController::class); + $routes->addRoute(['GET', 'POST'], '/logout', LogoutController::class); + $routes->addRoute(['GET', 'POST'], '/navigation', NavigationController::class); + $routes->addRoute(['GET', 'POST'], '/normalization', NormalizationController::class); + $routes->get('/phpinfo', PhpInfoController::class); $routes->addGroup('/preferences', static function (RouteCollector $routes): void { - $routes->addRoute(['GET', 'POST'], '/export', [PreferencesExportController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/features', [FeaturesController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/import', [PreferencesImportController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/main-panel', [MainPanelController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/manage', [ManageController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/navigation', [PreferencesNavigationController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/sql', [PreferencesSqlController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/two-factor', [TwoFactorController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/export', PreferencesExportController::class); + $routes->addRoute(['GET', 'POST'], '/features', FeaturesController::class); + $routes->addRoute(['GET', 'POST'], '/import', PreferencesImportController::class); + $routes->addRoute(['GET', 'POST'], '/main-panel', MainPanelController::class); + $routes->addRoute(['GET', 'POST'], '/manage', ManageController::class); + $routes->addRoute(['GET', 'POST'], '/navigation', PreferencesNavigationController::class); + $routes->addRoute(['GET', 'POST'], '/sql', PreferencesSqlController::class); + $routes->addRoute(['GET', 'POST'], '/two-factor', TwoFactorController::class); }); - $routes->addRoute(['GET', 'POST'], '/schema-export', [SchemaExportController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/schema-export', SchemaExportController::class); $routes->addGroup('/server', static function (RouteCollector $routes): void { - $routes->addRoute(['GET', 'POST'], '/binlog', [BinlogController::class, 'index']); - $routes->get('/collations', [CollationsController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/binlog', BinlogController::class); + $routes->get('/collations', CollationsController::class); $routes->addGroup('/databases', static function (RouteCollector $routes): void { $routes->addRoute(['GET', 'POST'], '', [DatabasesController::class, 'index']); $routes->post('/create', [DatabasesController::class, 'create']); @@ -226,19 +226,19 @@ return static function (RouteCollector $routes): void { $routes->get('', [EnginesController::class, 'index']); $routes->get('/{engine}[/{page}]', [EnginesController::class, 'show']); }); - $routes->addRoute(['GET', 'POST'], '/export', [ServerExportController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/import', [ServerImportController::class, 'index']); - $routes->get('/plugins', [PluginsController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/export', ServerExportController::class); + $routes->addRoute(['GET', 'POST'], '/import', ServerImportController::class); + $routes->get('/plugins', PluginsController::class); $routes->addGroup('/privileges', static function (RouteCollector $routes): void { - $routes->addRoute(['GET', 'POST'], '', [PrivilegesController::class, 'index']); - $routes->post('/account-lock', [AccountLockController::class, '__invoke']); - $routes->post('/account-unlock', [AccountUnlockController::class, '__invoke']); + $routes->addRoute(['GET', 'POST'], '', PrivilegesController::class); + $routes->post('/account-lock', AccountLockController::class); + $routes->post('/account-unlock', AccountUnlockController::class); }); - $routes->addRoute(['GET', 'POST'], '/replication', [ReplicationController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/sql', [ServerSqlController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/replication', ReplicationController::class); + $routes->addRoute(['GET', 'POST'], '/sql', ServerSqlController::class); $routes->addGroup('/status', static function (RouteCollector $routes): void { - $routes->get('', [StatusController::class, 'index']); - $routes->get('/advisor', [AdvisorController::class, 'index']); + $routes->get('', StatusController::class); + $routes->get('/advisor', AdvisorController::class); $routes->addGroup('/monitor', static function (RouteCollector $routes): void { $routes->get('', [MonitorController::class, 'index']); $routes->post('/chart', [MonitorController::class, 'chartingData']); @@ -252,8 +252,8 @@ return static function (RouteCollector $routes): void { $routes->post('/refresh', [ProcessesController::class, 'refresh']); $routes->post('/kill/{id:\d+}', [ProcessesController::class, 'kill']); }); - $routes->get('/queries', [QueriesController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/variables', [StatusVariables::class, 'index']); + $routes->get('/queries', QueriesController::class); + $routes->addRoute(['GET', 'POST'], '/variables', StatusVariables::class); }); $routes->addGroup('/user-groups', static function (RouteCollector $routes): void { $routes->addRoute(['GET', 'POST'], '', [UserGroupsController::class, 'index']); @@ -274,13 +274,13 @@ return static function (RouteCollector $routes): void { $routes->post('/set-column-preferences', [SqlController::class, 'setColumnOrderOrVisibility']); }); $routes->addGroup('/table', static function (RouteCollector $routes): void { - $routes->addRoute(['GET', 'POST'], '/add-field', [AddFieldController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/add-field', AddFieldController::class); $routes->addGroup('/change', static function (RouteCollector $routes): void { $routes->addRoute(['GET', 'POST'], '', [ChangeController::class, 'index']); $routes->post('/rows', [ChangeController::class, 'rows']); }); - $routes->addRoute(['GET', 'POST'], '/chart', [ChartController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/create', [CreateController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/chart', ChartController::class); + $routes->addRoute(['GET', 'POST'], '/create', CreateController::class); $routes->addGroup('/delete', static function (RouteCollector $routes): void { $routes->post('/confirm', [DeleteController::class, 'confirm']); $routes->post('/rows', [DeleteController::class, 'rows']); @@ -289,10 +289,10 @@ return static function (RouteCollector $routes): void { $routes->addRoute(['GET', 'POST'], '', [TableExportController::class, 'index']); $routes->post('/rows', [TableExportController::class, 'rows']); }); - $routes->addRoute(['GET', 'POST'], '/find-replace', [FindReplaceController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/get-field', [GetFieldController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/gis-visualization', [GisVisualizationController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/import', [TableImportController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/find-replace', FindReplaceController::class); + $routes->addRoute(['GET', 'POST'], '/get-field', GetFieldController::class); + $routes->addRoute(['GET', 'POST'], '/gis-visualization', GisVisualizationController::class); + $routes->addRoute(['GET', 'POST'], '/import', TableImportController::class); $routes->addRoute(['GET', 'POST'], '/indexes', [IndexesController::class, 'index']); $routes->addRoute(['GET', 'POST'], '/indexes/rename', [IndexesController::class, 'indexRename']); $routes->addGroup('/maintenance', static function (RouteCollector $routes): void { @@ -311,12 +311,12 @@ return static function (RouteCollector $routes): void { $routes->post('/repair', [PartitionController::class, 'repair']); $routes->post('/truncate', [PartitionController::class, 'truncate']); }); - $routes->addRoute(['GET', 'POST'], '/operations', [TableOperationsController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/recent-favorite', [RecentFavoriteController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/relation', [RelationController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/replace', [ReplaceController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/search', [TableSearchController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/sql', [TableSqlController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/operations', TableOperationsController::class); + $routes->addRoute(['GET', 'POST'], '/recent-favorite', RecentFavoriteController::class); + $routes->addRoute(['GET', 'POST'], '/relation', RelationController::class); + $routes->addRoute(['GET', 'POST'], '/replace', ReplaceController::class); + $routes->addRoute(['GET', 'POST'], '/search', TableSearchController::class); + $routes->addRoute(['GET', 'POST'], '/sql', TableSqlController::class); $routes->addGroup('/structure', static function (RouteCollector $routes): void { $routes->addRoute(['GET', 'POST'], '', [TableStructureController::class, 'index']); $routes->post('/add-key', [TableStructureController::class, 'addKey']); @@ -324,8 +324,8 @@ return static function (RouteCollector $routes): void { $routes->post('/central-columns-add', [TableStructureController::class, 'addToCentralColumns']); $routes->post('/central-columns-remove', [TableStructureController::class, 'removeFromCentralColumns']); $routes->addRoute(['GET', 'POST'], '/change', [TableStructureController::class, 'change']); - $routes->post('/drop', [DropColumnController::class, 'process']); - $routes->post('/drop-confirm', [DropColumnConfirmationController::class, 'process']); + $routes->post('/drop', DropColumnController::class); + $routes->post('/drop-confirm', DropColumnConfirmationController::class); $routes->post('/fulltext', [TableStructureController::class, 'fulltext']); $routes->post('/index', [TableStructureController::class, 'addIndex']); $routes->post('/move-columns', [TableStructureController::class, 'moveColumns']); @@ -336,23 +336,23 @@ return static function (RouteCollector $routes): void { $routes->post('/spatial', [TableStructureController::class, 'spatial']); $routes->post('/unique', [TableStructureController::class, 'unique']); }); - $routes->addRoute(['GET', 'POST'], '/tracking', [TableTrackingController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/triggers', [TableTriggersController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/zoom-search', [ZoomSearchController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/tracking', TableTrackingController::class); + $routes->addRoute(['GET', 'POST'], '/triggers', TableTriggersController::class); + $routes->addRoute(['GET', 'POST'], '/zoom-search', ZoomSearchController::class); }); - $routes->post('/tables', [TableController::class, 'all']); + $routes->post('/tables', TableController::class); $routes->addGroup('/themes', static function (RouteCollector $routes): void { $routes->get('', [ThemesController::class, 'index']); $routes->post('/set', [ThemesController::class, 'setTheme']); }); $routes->addGroup('/transformation', static function (RouteCollector $routes): void { - $routes->addRoute(['GET', 'POST'], '/overview', [TransformationOverviewController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/wrapper', [TransformationWrapperController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/overview', TransformationOverviewController::class); + $routes->addRoute(['GET', 'POST'], '/wrapper', TransformationWrapperController::class); }); - $routes->addRoute(['GET', 'POST'], '/user-password', [UserPasswordController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/version-check', [VersionCheckController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/user-password', UserPasswordController::class); + $routes->addRoute(['GET', 'POST'], '/version-check', VersionCheckController::class); $routes->addGroup('/view', static function (RouteCollector $routes): void { - $routes->addRoute(['GET', 'POST'], '/create', [ViewCreateController::class, 'index']); - $routes->addRoute(['GET', 'POST'], '/operations', [ViewOperationsController::class, 'index']); + $routes->addRoute(['GET', 'POST'], '/create', ViewCreateController::class); + $routes->addRoute(['GET', 'POST'], '/operations', ViewOperationsController::class); }); }; diff --git a/setup/index.php b/setup/index.php index d6ff1bbc20..82cb880c97 100644 --- a/setup/index.php +++ b/setup/index.php @@ -41,8 +41,7 @@ if ($page === '') { Core::noCacheHeader(); if ($page === 'form') { - $controller = new FormController($GLOBALS['ConfigFile'], new Template()); - echo $controller->index([ + echo (new FormController($GLOBALS['ConfigFile'], new Template()))([ 'formset' => $_GET['formset'] ?? null, ]); @@ -50,8 +49,7 @@ if ($page === 'form') { } if ($page === 'config') { - $controller = new ConfigController($GLOBALS['ConfigFile'], new Template()); - echo $controller->index([ + echo (new ConfigController($GLOBALS['ConfigFile'], new Template()))([ 'formset' => $_GET['formset'] ?? null, 'eol' => $_GET['eol'] ?? null, ]); @@ -79,8 +77,7 @@ if ($page === 'servers') { return; } -$controller = new HomeController($GLOBALS['ConfigFile'], new Template()); -echo $controller->index([ +echo (new HomeController($GLOBALS['ConfigFile'], new Template()))([ 'formset' => $_GET['formset'] ?? null, 'action_done' => $_GET['action_done'] ?? null, 'version_check' => $_GET['version_check'] ?? null, diff --git a/test/classes/Controllers/Database/PrivilegesControllerTest.php b/test/classes/Controllers/Database/PrivilegesControllerTest.php index 359394938b..e8714acc68 100644 --- a/test/classes/Controllers/Database/PrivilegesControllerTest.php +++ b/test/classes/Controllers/Database/PrivilegesControllerTest.php @@ -45,14 +45,13 @@ class PrivilegesControllerTest extends AbstractTestCase $serverPrivileges->method('getAllPrivileges') ->willReturn($privileges); - $controller = new PrivilegesController( + $actual = (new PrivilegesController( ResponseRenderer::getInstance(), new Template(), $db, $serverPrivileges, $dbi - ); - $actual = $controller->index(['checkprivsdb' => $db]); + ))(['checkprivsdb' => $db]); $this->assertStringContainsString( Url::getCommon(['db' => $db], ''), diff --git a/test/classes/Controllers/ImportControllerTest.php b/test/classes/Controllers/ImportControllerTest.php index 26676cb480..99d5506e78 100644 --- a/test/classes/Controllers/ImportControllerTest.php +++ b/test/classes/Controllers/ImportControllerTest.php @@ -59,7 +59,7 @@ class ImportControllerTest extends AbstractTestCase $importController = $containerBuilder->get(ImportController::class); $this->dummyDbi->addSelectDb('pma_test'); $this->dummyDbi->addSelectDb('pma_test'); - $importController->index(); + $importController(); $this->assertAllSelectsConsumed(); $this->assertResponseWasSuccessfull(); diff --git a/test/classes/Controllers/JavaScriptMessagesControllerTest.php b/test/classes/Controllers/JavaScriptMessagesControllerTest.php index a9d7760f5b..0c84d4ea7c 100644 --- a/test/classes/Controllers/JavaScriptMessagesControllerTest.php +++ b/test/classes/Controllers/JavaScriptMessagesControllerTest.php @@ -26,10 +26,8 @@ class JavaScriptMessagesControllerTest extends TestCase $cfg['GridEditing'] = 'double-click'; - $controller = new JavaScriptMessagesController(); - ob_start(); - $controller->index(); + (new JavaScriptMessagesController())(); $actual = ob_get_contents(); ob_end_clean(); diff --git a/test/classes/Controllers/NavigationControllerTest.php b/test/classes/Controllers/NavigationControllerTest.php index f4b25fe0b0..4e14f53707 100644 --- a/test/classes/Controllers/NavigationControllerTest.php +++ b/test/classes/Controllers/NavigationControllerTest.php @@ -115,7 +115,7 @@ class NavigationControllerTest extends AbstractTestCase $navigationController = $containerBuilder->get(NavigationController::class); $_POST['full'] = '1'; $this->setResponseIsAjax(); - $navigationController->index(); + $navigationController(); $this->assertResponseWasSuccessfull(); $responseMessage = $this->getResponseJsonResult()['message']; @@ -275,7 +275,7 @@ class NavigationControllerTest extends AbstractTestCase $navigationController = $containerBuilder->get(NavigationController::class); $_POST['full'] = '1'; $this->setResponseIsAjax(); - $navigationController->index(); + $navigationController(); $this->assertResponseWasSuccessfull(); $responseMessage = $this->getResponseJsonResult()['message']; diff --git a/test/classes/Controllers/NormalizationControllerTest.php b/test/classes/Controllers/NormalizationControllerTest.php index 8ea26489e3..42eb26060d 100644 --- a/test/classes/Controllers/NormalizationControllerTest.php +++ b/test/classes/Controllers/NormalizationControllerTest.php @@ -66,7 +66,7 @@ class NormalizationControllerTest extends AbstractTestCase $containerBuilder->setParameter('table', $GLOBALS['table']); /** @var NormalizationController $normalizationController */ $normalizationController = $containerBuilder->get(NormalizationController::class); - $normalizationController->index(); + $normalizationController(); $this->assertResponseWasSuccessfull(); @@ -118,7 +118,7 @@ class NormalizationControllerTest extends AbstractTestCase $containerBuilder->setParameter('table', $GLOBALS['table']); /** @var NormalizationController $normalizationController */ $normalizationController = $containerBuilder->get(NormalizationController::class); - $normalizationController->index(); + $normalizationController(); $this->expectOutputString( '

In order to put the original table \'test_tbl\' into Second normal' . ' form we need to create the following tables:

get(NormalizationController::class); $this->dummyDbi->addSelectDb('my_db'); - $normalizationController->index(); + $normalizationController(); $this->assertAllSelectsConsumed(); $this->assertResponseWasSuccessfull(); @@ -187,7 +187,7 @@ class NormalizationControllerTest extends AbstractTestCase /** @var NormalizationController $normalizationController */ $normalizationController = $containerBuilder->get(NormalizationController::class); $this->dummyDbi->addSelectDb('my_db'); - $normalizationController->index(); + $normalizationController(); $this->assertAllSelectsConsumed(); $this->assertResponseWasSuccessfull(); diff --git a/test/classes/Controllers/Server/BinlogControllerTest.php b/test/classes/Controllers/Server/BinlogControllerTest.php index 85dcb02b0f..33954210b6 100644 --- a/test/classes/Controllers/Server/BinlogControllerTest.php +++ b/test/classes/Controllers/Server/BinlogControllerTest.php @@ -47,7 +47,7 @@ class BinlogControllerTest extends AbstractTestCase $_POST['log'] = 'index1'; $_POST['pos'] = '3'; $this->dummyDbi->addSelectDb('mysql'); - $controller->index(); + $controller(); $this->assertAllSelectsConsumed(); $actual = $response->getHTMLResult(); diff --git a/test/classes/Controllers/Server/CollationsControllerTest.php b/test/classes/Controllers/Server/CollationsControllerTest.php index dac16e6b71..7b872d85ec 100644 --- a/test/classes/Controllers/Server/CollationsControllerTest.php +++ b/test/classes/Controllers/Server/CollationsControllerTest.php @@ -38,7 +38,7 @@ class CollationsControllerTest extends AbstractTestCase $controller = new CollationsController($response, new Template(), $GLOBALS['dbi']); $this->dummyDbi->addSelectDb('mysql'); - $controller->index(); + $controller(); $this->assertAllSelectsConsumed(); $actual = $response->getHTMLResult(); diff --git a/test/classes/Controllers/Server/PluginsControllerTest.php b/test/classes/Controllers/Server/PluginsControllerTest.php index 69b754c7f3..0748c34631 100644 --- a/test/classes/Controllers/Server/PluginsControllerTest.php +++ b/test/classes/Controllers/Server/PluginsControllerTest.php @@ -68,7 +68,7 @@ class PluginsControllerTest extends AbstractTestCase $controller = new PluginsController($response, new Template(), new Plugins($dbi), $GLOBALS['dbi']); $this->dummyDbi->addSelectDb('mysql'); - $controller->index(); + $controller(); $this->assertAllSelectsConsumed(); $actual = $response->getHTMLResult(); diff --git a/test/classes/Controllers/Server/Status/AdvisorControllerTest.php b/test/classes/Controllers/Server/Status/AdvisorControllerTest.php index e6be1a1120..5e487d1e68 100644 --- a/test/classes/Controllers/Server/Status/AdvisorControllerTest.php +++ b/test/classes/Controllers/Server/Status/AdvisorControllerTest.php @@ -54,7 +54,7 @@ class AdvisorControllerTest extends AbstractTestCase new Advisor($GLOBALS['dbi'], new ExpressionLanguage()) ); - $controller->index(); + $controller(); $expected = $this->template->render('server/status/advisor/index', [ 'data' => [], @@ -103,7 +103,7 @@ class AdvisorControllerTest extends AbstractTestCase $advisor ); - $controller->index(); + $controller(); $expected = $this->template->render('server/status/advisor/index', ['data' => $advisorData]); diff --git a/test/classes/Controllers/Server/Status/QueriesControllerTest.php b/test/classes/Controllers/Server/Status/QueriesControllerTest.php index 883c5ed539..f4312281e0 100644 --- a/test/classes/Controllers/Server/Status/QueriesControllerTest.php +++ b/test/classes/Controllers/Server/Status/QueriesControllerTest.php @@ -58,7 +58,7 @@ class QueriesControllerTest extends AbstractTestCase $controller = new QueriesController($response, new Template(), $this->data, $dbi); $this->dummyDbi->addSelectDb('mysql'); - $controller->index(); + $controller(); $this->assertAllSelectsConsumed(); $html = $response->getHTMLResult(); diff --git a/test/classes/Controllers/Server/Status/StatusControllerTest.php b/test/classes/Controllers/Server/Status/StatusControllerTest.php index 8892029372..33cf3cdec5 100644 --- a/test/classes/Controllers/Server/Status/StatusControllerTest.php +++ b/test/classes/Controllers/Server/Status/StatusControllerTest.php @@ -64,7 +64,7 @@ class StatusControllerTest extends AbstractTestCase $replicationInfo->replicaVariables = []; $this->dummyDbi->addSelectDb('mysql'); - $controller->index(); + $controller(); $this->assertAllSelectsConsumed(); $html = $response->getHTMLResult(); diff --git a/test/classes/Controllers/Server/Status/VariablesControllerTest.php b/test/classes/Controllers/Server/Status/VariablesControllerTest.php index 9e1c8021a0..bb121604af 100644 --- a/test/classes/Controllers/Server/Status/VariablesControllerTest.php +++ b/test/classes/Controllers/Server/Status/VariablesControllerTest.php @@ -42,7 +42,7 @@ class VariablesControllerTest extends AbstractTestCase $controller = new VariablesController($response, new Template(), $this->data, $GLOBALS['dbi']); $this->dummyDbi->addSelectDb('mysql'); - $controller->index(); + $controller(); $this->assertAllSelectsConsumed(); $html = $response->getHTMLResult(); diff --git a/test/classes/Controllers/Table/PrivilegesControllerTest.php b/test/classes/Controllers/Table/PrivilegesControllerTest.php index 2c0f4d62a4..d5af3b811f 100644 --- a/test/classes/Controllers/Table/PrivilegesControllerTest.php +++ b/test/classes/Controllers/Table/PrivilegesControllerTest.php @@ -46,18 +46,14 @@ class PrivilegesControllerTest extends AbstractTestCase $serverPrivileges->method('getAllPrivileges') ->willReturn($privileges); - $controller = new PrivilegesController( + $actual = (new PrivilegesController( ResponseRenderer::getInstance(), new Template(), $db, $table, $serverPrivileges, $dbi - ); - $actual = $controller->index([ - 'checkprivsdb' => $db, - 'checkprivstable' => $table, - ]); + ))(['checkprivsdb' => $db, 'checkprivstable' => $table]); $this->assertStringContainsString( $db . '.' . $table, diff --git a/test/classes/Controllers/Table/ReplaceControllerTest.php b/test/classes/Controllers/Table/ReplaceControllerTest.php index 07b0a46db5..86904d03dd 100644 --- a/test/classes/Controllers/Table/ReplaceControllerTest.php +++ b/test/classes/Controllers/Table/ReplaceControllerTest.php @@ -98,7 +98,7 @@ class ReplaceControllerTest extends AbstractTestCase $replaceController = $containerBuilder->get(ReplaceController::class); $this->dummyDbi->addSelectDb('my_db'); $this->dummyDbi->addSelectDb('my_db'); - $replaceController->index(); + $replaceController(); $this->assertAllSelectsConsumed(); $this->assertStringContainsString( 'class="icon ic_s_success"> Showing rows 0 - 1 (2 total, Query took', @@ -140,7 +140,7 @@ class ReplaceControllerTest extends AbstractTestCase $this->dummyDbi->addSelectDb('my_db'); $this->dummyDbi->addSelectDb('my_db'); $this->dummyDbi->addSelectDb('my_db'); - $replaceController->index(); + $replaceController(); $this->assertAllSelectsConsumed(); $this->assertEquals(5, $GLOBALS['cfg']['InsertRows']); $this->assertStringContainsString( diff --git a/test/classes/Controllers/TransformationOverviewControllerTest.php b/test/classes/Controllers/TransformationOverviewControllerTest.php index 6904f61e6b..1a30a4a326 100644 --- a/test/classes/Controllers/TransformationOverviewControllerTest.php +++ b/test/classes/Controllers/TransformationOverviewControllerTest.php @@ -39,7 +39,7 @@ class TransformationOverviewControllerTest extends AbstractTestCase $controller = new TransformationOverviewController($response, new Template(), new Transformations()); - $controller->index(); + $controller(); $actual = $response->getHTMLResult(); $this->assertStringContainsString(