Extract normalization's partial dependencies action

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

4 files changed, 36 insertions, 22 deletions

diff --git a/libraries/classes/Controllers/Normalization/MainController.php b/libraries/classes/Controllers/Normalization/MainController.php
index 571dde45d2..91bde1300b 100644
--- a/libraries/classes/Controllers/Normalization/MainController.php
+++ b/libraries/classes/Controllers/Normalization/MainController.php
@@ -6,35 +6,15 @@ namespace PhpMyAdmin\Controllers\Normalization;
 
 use PhpMyAdmin\Controllers\AbstractController;
 use PhpMyAdmin\Http\ServerRequest;
-use PhpMyAdmin\Normalization;
-use PhpMyAdmin\ResponseRenderer;
-use PhpMyAdmin\Template;
 
 /**
  * Normalization process (temporarily specific to 1NF).
  */
 class MainController 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
     {
-        if (isset($_POST['findPdl'])) {
-            $html = $this->normalization->findPartialDependencies($GLOBALS['table'], $GLOBALS['db']);
-            echo $html;
-
-            return;
-        }
-
         $this->addScriptFiles(['normalization.js', 'vendor/jquery/jquery.uitablefilter.js']);
-
         $this->render('table/normalization/normalization', [
             'db' => $GLOBALS['db'],
             'table' => $GLOBALS['table'],
diff --git a/libraries/classes/Controllers/Normalization/PartialDependenciesController.php b/libraries/classes/Controllers/Normalization/PartialDependenciesController.php
new file mode 100644
index 0000000000..a847ef6832
--- /dev/null
+++ b/libraries/classes/Controllers/Normalization/PartialDependenciesController.php
@@ -0,0 +1,29 @@
+<?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;
+
+final class PartialDependenciesController 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 = $this->normalization->findPartialDependencies($GLOBALS['table'], $GLOBALS['db']);
+        $this->response->addHTML($html);
+    }
+}
diff --git a/libraries/routes.php b/libraries/routes.php
index a71f637d20..44f1062780 100644
--- a/libraries/routes.php
+++ b/libraries/routes.php
@@ -145,6 +145,7 @@ return static function (RouteCollector $routes): void {
         $routes->post('/get-columns', Normalization\GetColumnsController::class);
         $routes->post('/create-new-column', Normalization\CreateNewColumnController::class);
         $routes->post('/move-repeating-group', Normalization\MoveRepeatingGroup::class);
+        $routes->post('/partial-dependencies', Normalization\PartialDependenciesController::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 ddc00d922f..02725969a4 100644
--- a/libraries/services_controllers.php
+++ b/libraries/services_controllers.php
@@ -688,6 +688,10 @@ return [
                 '$normalization' => '@normalization',
             ],
         ],
+        Normalization\MainController::class => [
+            'class' => Normalization\MainController::class,
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
+        ],
         Normalization\MoveRepeatingGroup::class => [
             'class' => Normalization\MoveRepeatingGroup::class,
             'arguments' => [
@@ -696,8 +700,8 @@ return [
                 '$normalization' => '@normalization',
             ],
         ],
-        Normalization\MainController::class => [
-            'class' => Normalization\MainController::class,
+        Normalization\PartialDependenciesController::class => [
+            'class' => Normalization\PartialDependenciesController::class,
             'arguments' => [
                 '$response' => '@response',
                 '$template' => '@template',