Create SqlAutoCompleteController

Moves database sql autocomplete entry point logic to the
Database\SqlAutoCompleteController and removes the entry point file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

libraries/classes/Controllers/Database/SqlAutoCompleteController.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package PhpMyAdmin\Controllers\Database
+ */
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Controllers\Database;
+
+/**
+ * Table/Column autocomplete in SQL editors.
+ * @package PhpMyAdmin\Controllers\Database
+ */
+class SqlAutoCompleteController extends AbstractController
+{
+    /**
+     * @return array JSON
+     */
+    public function index(): array
+    {
+        global $cfg, $db, $sql_autocomplete;
+
+        $sql_autocomplete = true;
+        if ($cfg['EnableAutocompleteForTablesAndColumns']) {
+            $db = isset($_POST['db']) ? $_POST['db'] : $db;
+            $sql_autocomplete = [];
+            if ($db) {
+                $tableNames = $this->dbi->getTables($db);
+                foreach ($tableNames as $tableName) {
+                    $sql_autocomplete[$tableName] = $this->dbi->getColumns(
+                        $db,
+                        $tableName
+                    );
+                }
+            }
+        }
+        return ['tables' => json_encode($sql_autocomplete)];
+    }
+}

libraries/routes.php

@@ -18,6 +18,7 @@
 use PhpMyAdmin\Controllers\Database\QueryByExampleController;
 use PhpMyAdmin\Controllers\Database\RoutinesController;
 use PhpMyAdmin\Controllers\Database\SearchController;
+use PhpMyAdmin\Controllers\Database\SqlAutoCompleteController;
 use PhpMyAdmin\Controllers\Database\StructureController;
 use PhpMyAdmin\Controllers\Database\TriggersController;
 use PhpMyAdmin\Controllers\ErrorReportController;
@@ -197,12 +198,14 @@
             $controller = $containerBuilder->get(SearchController::class);
             $controller->index();
         });
-        $routes->addGroup('/sql', function (RouteCollector $routes) {
+        $routes->addGroup('/sql', function (RouteCollector $routes) use ($containerBuilder, $response) {
             $routes->addRoute(['GET', 'POST'], '', function () {
                 require_once ROOT_PATH . 'libraries/entry_points/database/sql.php';
             });
-            $routes->post('/autocomplete', function () {
-                require_once ROOT_PATH . 'libraries/entry_points/database/sql/autocomplete.php';
+            $routes->post('/autocomplete', function () use ($containerBuilder, $response) {
+                /** @var SqlAutoCompleteController $controller */
+                $controller = $containerBuilder->get(SqlAutoCompleteController::class);
+                $response->addJSON($controller->index());
             });
             $routes->post('/format', function () {
                 require_once ROOT_PATH . 'libraries/entry_points/database/sql/format.php';

services_controllers.yml

@@ -123,6 +123,14 @@ services:
       template: '@template'
       db: '%db%'
 
+  PhpMyAdmin\Controllers\Database\SqlAutoCompleteController:
+    class: 'PhpMyAdmin\Controllers\Database\SqlAutoCompleteController'
+    arguments:
+      response: '@response'
+      dbi: '@dbi'
+      template: '@template'
+      db: '%db%'
+
   PhpMyAdmin\Controllers\Database\SqlController:
     class: 'PhpMyAdmin\Controllers\Database\SqlController'
     arguments: