Make controllers callable

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-08-30 13:16:29 -03:00 · 2021-08-30 13:16:29 -03:00 · a2ed4dfe68
commit a2ed4dfe68
parent 64d7245f66
100 changed files with 211 additions and 203 deletions
--- 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();
--- 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,
--- 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();
--- 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;

--- 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);
--- 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);

--- 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;
--- 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;
--- 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;
--- 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;

--- 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;
--- 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;
--- 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;
--- 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;

--- 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;

--- 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'] : '';
--- 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;
--- 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;
--- 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;

--- 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;

--- 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;
--- 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;
--- 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;

--- 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) . ';';
    }
--- 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');
--- 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,
--- 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;

--- 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(
--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;
--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;
--- 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;

--- 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;

--- 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 {
--- 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;

--- 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;

--- 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) {
--- 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;

--- 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;

--- 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;

--- 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();

--- 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();

--- 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();

--- 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;
--- 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;

--- 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;

--- 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;

--- 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'] ?? [];

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;
--- 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;

--- 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;

--- 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;

--- 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;
        }
--- 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;

--- 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;

--- 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;
--- 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;
--- 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;

--- 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);
--- 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();
--- 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;
--- 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;

--- 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';

--- 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;
--- 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;
--- 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;
    }
--- 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;
        }
--- 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<string, string> $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);
    }
 }
--- 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);
    });
 };
--- 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,
--- 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], ''),
--- 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();

--- 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();

--- 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'];
--- 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(
            '<p><b>In order to put the original table \'test_tbl\' into Second normal'
            . ' form we need to create the following tables:</b></p><p><input type="text" '
@ -147,7 +147,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();
@ -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();
--- 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();

--- 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();

--- 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();

--- 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]);

--- 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();

--- 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();

--- 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();

--- 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,
--- 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(
--- 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(