Extract normalization 1NF step 2 action

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

4 files changed, 38 insertions, 7 deletions

diff --git a/libraries/classes/Controllers/Normalization/FirstNormalForm/SecondStepController.php b/libraries/classes/Controllers/Normalization/FirstNormalForm/SecondStepController.php
new file mode 100644
index 0000000000..630f117182
--- /dev/null
+++ b/libraries/classes/Controllers/Normalization/FirstNormalForm/SecondStepController.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Controllers\Normalization\FirstNormalForm;
+
+use PhpMyAdmin\Controllers\AbstractController;
+use PhpMyAdmin\Http\ServerRequest;
+use PhpMyAdmin\Normalization;
+use PhpMyAdmin\ResponseRenderer;
+use PhpMyAdmin\Template;
+
+final class SecondStepController 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
+    {
+        $res = $this->normalization->getHtmlContentsFor1NFStep2($GLOBALS['db'], $GLOBALS['table']);
+        $this->response->addJSON($res);
+    }
+}
diff --git a/libraries/classes/Controllers/NormalizationController.php b/libraries/classes/Controllers/NormalizationController.php
index 859ff1610f..97e7f74433 100644
--- a/libraries/classes/Controllers/NormalizationController.php
+++ b/libraries/classes/Controllers/NormalizationController.php
@@ -143,13 +143,6 @@ class NormalizationController extends AbstractController
             return;
         }
 
-        if (isset($_POST['step2'])) {
-            $res = $this->normalization->getHtmlContentsFor1NFStep2($GLOBALS['db'], $GLOBALS['table']);
-            $this->response->addJSON($res);
-
-            return;
-        }
-
         if (isset($_POST['step3'])) {
             $res = $this->normalization->getHtmlContentsFor1NFStep3($GLOBALS['db'], $GLOBALS['table']);
             $this->response->addJSON($res);
diff --git a/libraries/routes.php b/libraries/routes.php
index 27a509246f..3b397d0a3b 100644
--- a/libraries/routes.php
+++ b/libraries/routes.php
@@ -133,6 +133,7 @@ return static function (RouteCollector $routes): void {
     $routes->addGroup('/normalization', static function (RouteCollector $routes): void {
         $routes->addRoute(['GET', 'POST'], '', NormalizationController::class);
         $routes->post('/1nf/step1', Normalization\FirstNormalForm\FirstStepController::class);
+        $routes->post('/1nf/step2', Normalization\FirstNormalForm\SecondStepController::class);
     });
     $routes->get('/phpinfo', PhpInfoController::class);
     $routes->addGroup('/preferences', static function (RouteCollector $routes): void {
diff --git a/libraries/services_controllers.php b/libraries/services_controllers.php
index 22aa34afb6..1c56d43e66 100644
--- a/libraries/services_controllers.php
+++ b/libraries/services_controllers.php
@@ -593,6 +593,14 @@ return [
                 '$normalization' => '@normalization',
             ],
         ],
+        Normalization\FirstNormalForm\SecondStepController::class => [
+            'class' => Normalization\FirstNormalForm\SecondStepController::class,
+            'arguments' => [
+                '$response' => '@response',
+                '$template' => '@template',
+                '$normalization' => '@normalization',
+            ],
+        ],
         NormalizationController::class => [
             'class' => NormalizationController::class,
             'arguments' => [