Make controllers callable

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Aug 30, 2021 · a2ed4df · a2ed4df
1 parent 64d7245
commit a2ed4df
Show file tree

Hide file tree

Showing 100 changed files with 211 additions and 203 deletions.
diff --git a/js/messages.php b/js/messages.php
@@ -64,4 +64,4 @@
 
 /** @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
@@ -32,7 +32,7 @@ public function __construct($response, Template $template, $browseForeigners, $r
         $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
@@ -21,7 +21,7 @@
 
 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
@@ -25,7 +25,7 @@ public function __construct($response, Template $template, Relation $relation)
         $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
@@ -24,7 +24,7 @@ public function __construct($response, Template $template, $dbi)
         $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
@@ -41,7 +41,7 @@ public function __construct($response, Template $template, $db, $relation, $tran
         $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
@@ -40,7 +40,7 @@ public function __construct(
         $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
@@ -33,7 +33,7 @@ public function __construct($response, Template $template, $db, Events $events,
         $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
@@ -39,7 +39,7 @@ public function __construct($response, Template $template, $db, $dbi)
         $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
@@ -39,7 +39,7 @@ public function __construct($response, Template $template, $db, Privileges $priv
     /**
      * @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
@@ -39,7 +39,7 @@ public function __construct($response, Template $template, $db, Relation $relati
         $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
@@ -40,7 +40,7 @@ public function __construct($response, Template $template, $db, CheckUserPrivile
         $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
@@ -30,7 +30,7 @@ public function __construct($response, Template $template, $db, $dbi)
         $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
@@ -29,7 +29,7 @@ public function __construct($response, Template $template, $db, $dbi)
         $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
@@ -31,7 +31,7 @@ public function __construct($response, Template $template, $db, SqlQueryForm $sq
         $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
@@ -13,7 +13,7 @@
  */
 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
@@ -43,7 +43,7 @@ public function __construct($response, Template $template, $db, Tracking $tracki
         $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
@@ -34,7 +34,7 @@ public function __construct($response, Template $template, $db, $dbi)
         $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
@@ -6,7 +6,7 @@
 
 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
@@ -46,7 +46,7 @@ public function __construct(
         $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
@@ -25,7 +25,7 @@
  */
 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
@@ -69,7 +69,7 @@ public function __construct($response, Template $template, Import $import, Sql $
         $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
@@ -33,7 +33,7 @@ public function __construct(Template $template)
         $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
@@ -23,7 +23,7 @@ public function __construct()
         $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
@@ -17,7 +17,7 @@
  */
 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
@@ -17,7 +17,7 @@
  */
 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
@@ -8,7 +8,7 @@
 
 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
@@ -41,7 +41,7 @@ public function __construct(
         $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
@@ -34,7 +34,7 @@ public function __construct($response, Template $template, Normalization $normal
         $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
@@ -18,7 +18,7 @@
  */
 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
@@ -45,7 +45,7 @@ public function __construct(
         $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
@@ -45,7 +45,7 @@ public function __construct(
         $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
@@ -45,7 +45,7 @@ public function __construct(
         $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
@@ -45,7 +45,7 @@ public function __construct(
         $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
@@ -67,7 +67,7 @@ public function __construct(
         $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
@@ -45,7 +45,7 @@ public function __construct(
         $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
@@ -45,7 +45,7 @@ public function __construct(
         $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
@@ -28,7 +28,7 @@ public function __construct($response, Template $template, Relation $relation)
         $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
@@ -29,7 +29,7 @@ public function __construct(Export $export, Relation $relation)
         $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
@@ -48,7 +48,7 @@ public function __construct($response, Template $template, $dbi)
         );
     }
 
-    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
@@ -49,7 +49,7 @@ public function __construct(
         $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
@@ -36,7 +36,7 @@ public function __construct($response, Template $template, Options $export, $dbi
         $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
@@ -39,7 +39,7 @@ public function __construct($response, Template $template, $dbi)
         $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
@@ -38,7 +38,7 @@ public function __construct($response, Template $template, Plugins $plugins, $db
         $this->dbi = $dbi;
     }
 
-    public function index(): void
+    public function __invoke(): void
     {
         global $errorUrl;