6 files changed, 97 insertions, 18 deletions

diff --git a/js/src/normalization.js b/js/src/normalization.js
index ac6c52e373..a64ac02acd 100644
--- a/js/src/normalization.js
+++ b/js/src/normalization.js
@@ -18,13 +18,12 @@ var dataParsed = null;
 
 function appendHtmlColumnsList () {
     $.post(
-        'index.php?route=/normalization',
+        'index.php?route=/normalization/get-columns',
         {
             'ajax_request': true,
             'db': window.CommonParams.get('db'),
             'table': window.CommonParams.get('table'),
             'server': window.CommonParams.get('server'),
-            'getColumns': true
         },
         function (data) {
             if (data.success === true) {
diff --git a/libraries/classes/Controllers/Normalization/GetColumnsController.php b/libraries/classes/Controllers/Normalization/GetColumnsController.php
new file mode 100644
index 0000000000..f9d6e333b6
--- /dev/null
+++ b/libraries/classes/Controllers/Normalization/GetColumnsController.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Controllers\Normalization;
+
+use PhpMyAdmin\Controllers\AbstractController;
+use PhpMyAdmin\Http\ServerRequest;
+use PhpMyAdmin\Normalization;
+use PhpMyAdmin\ResponseRenderer;
+use PhpMyAdmin\Template;
+
+use function __;
+use function _pgettext;
+
+final class GetColumnsController extends AbstractController
+{
+    /** @var Normalization */
+    private $normalization;
+
+    public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
+    {
+        parent::__construct($response, $template);
+        $this->normalization = $normalization;
+    }
+
+    public function __invoke(ServerRequest $request): void
+    {
+        $html = '<option selected disabled>' . __('Select one…') . '</option>'
+            . '<option value="no_such_col">' . __('No such column') . '</option>';
+        //get column whose datatype falls under string category
+        $html .= $this->normalization->getHtmlForColumnsList(
+            $GLOBALS['db'],
+            $GLOBALS['table'],
+            _pgettext('string types', 'String')
+        );
+        $this->response->addHTML($html);
+    }
+}
diff --git a/libraries/classes/Controllers/Normalization/MainController.php b/libraries/classes/Controllers/Normalization/MainController.php
index 1d36f0cfbb..cfc59e0759 100644
--- a/libraries/classes/Controllers/Normalization/MainController.php
+++ b/libraries/classes/Controllers/Normalization/MainController.php
@@ -11,8 +11,6 @@ use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Url;
 
-use function __;
-use function _pgettext;
 use function intval;
 use function min;
 
@@ -32,20 +30,6 @@ class MainController extends AbstractController
 
     public function __invoke(ServerRequest $request): void
     {
-        if (isset($_POST['getColumns'])) {
-            $html = '<option selected disabled>' . __('Select one…') . '</option>'
-                . '<option value="no_such_col">' . __('No such column') . '</option>';
-            //get column whose datatype falls under string category
-            $html .= $this->normalization->getHtmlForColumnsList(
-                $GLOBALS['db'],
-                $GLOBALS['table'],
-                _pgettext('string types', 'String')
-            );
-            echo $html;
-
-            return;
-        }
-
         if (isset($_POST['splitColumn'])) {
             $num_fields = min(4096, intval($_POST['numFields']));
             $html = $this->normalization->getHtmlForCreateNewColumn($num_fields, $GLOBALS['db'], $GLOBALS['table']);
diff --git a/libraries/routes.php b/libraries/routes.php
index 236204281d..e8d730e776 100644
--- a/libraries/routes.php
+++ b/libraries/routes.php
@@ -142,6 +142,7 @@ return static function (RouteCollector $routes): void {
         $routes->post('/3nf/new-tables', Normalization\ThirdNormalForm\NewTablesController::class);
         $routes->post('/3nf/step1', Normalization\ThirdNormalForm\FirstStepController::class);
         $routes->post('/add-new-primary', Normalization\AddNewPrimaryController::class);
+        $routes->post('/get-columns', Normalization\GetColumnsController::class);
         $routes->post('/move-repeating-group', Normalization\MoveRepeatingGroup::class);
     });
     $routes->get('/phpinfo', PhpInfoController::class);
diff --git a/libraries/services_controllers.php b/libraries/services_controllers.php
index df20d35ff4..79f6ee8d9f 100644
--- a/libraries/services_controllers.php
+++ b/libraries/services_controllers.php
@@ -672,6 +672,14 @@ return [
                 '$normalization' => '@normalization',
             ],
         ],
+        Normalization\GetColumnsController::class => [
+            'class' => Normalization\GetColumnsController::class,
+            'arguments' => [
+                '$response' => '@response',
+                '$template' => '@template',
+                '$normalization' => '@normalization',
+            ],
+        ],
         Normalization\MoveRepeatingGroup::class => [
             'class' => Normalization\MoveRepeatingGroup::class,
             'arguments' => [
diff --git a/test/classes/Controllers/Normalization/GetColumnsControllerTest.php b/test/classes/Controllers/Normalization/GetColumnsControllerTest.php
new file mode 100644
index 0000000000..d9bc364973
--- /dev/null
+++ b/test/classes/Controllers/Normalization/GetColumnsControllerTest.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Tests\Controllers\Normalization;
+
+use PhpMyAdmin\ConfigStorage\Relation;
+use PhpMyAdmin\Controllers\Normalization\GetColumnsController;
+use PhpMyAdmin\Http\ServerRequest;
+use PhpMyAdmin\Normalization;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Tests\AbstractTestCase;
+use PhpMyAdmin\Tests\Stubs\ResponseRenderer;
+use PhpMyAdmin\Transformations;
+
+/**
+ * @covers \PhpMyAdmin\Controllers\Normalization\GetColumnsController
+ */
+class GetColumnsControllerTest extends AbstractTestCase
+{
+    public function testDefault(): void
+    {
+        $GLOBALS['db'] = 'test_db';
+        $GLOBALS['table'] = 'test_table';
+
+        $dbiDummy = $this->createDbiDummy();
+        $dbiDummy->addSelectDb('test_db');
+
+        $dbi = $this->createDatabaseInterface($dbiDummy);
+        $GLOBALS['dbi'] = $dbi;
+        $response = new ResponseRenderer();
+        $template = new Template();
+
+        $controller = new GetColumnsController(
+            $response,
+            $template,
+            new Normalization($dbi, new Relation($dbi), new Transformations(), $template)
+        );
+        $controller($this->createStub(ServerRequest::class));
+
+        // phpcs:disable Generic.Files.LineLength.TooLong
+        $this->assertSame(
+            '<option selected disabled>Select one…</option><option value="no_such_col">No such column</option><option value="name">name [ varchar(20) ]</option>',
+            $response->getHTMLResult()
+        );
+        // phpcs:enable
+    }
+}