Extract template render from ColumnsDefinition::displayForm

Related to #16258. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Jul 12, 2020 · 858e8dc · 858e8dc
1 parent 1dccc10
commit 858e8dc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 26 deletions.
diff --git a/libraries/classes/Controllers/Table/AddFieldController.php b/libraries/classes/Controllers/Table/AddFieldController.php
@@ -173,15 +173,17 @@ public function index(): void
          */
         $action = Url::getFromRoute('/table/add-field');
 
-        ColumnsDefinition::displayForm(
-            $this->response,
-            $this->template,
+        $this->addScriptFiles(['vendor/jquery/jquery.uitablefilter.js', 'indexes.js']);
+
+        $templateData = ColumnsDefinition::displayForm(
             $this->transformations,
             $this->relation,
             $this->dbi,
             $action,
             $num_fields,
             $regenerate
         );
+
+        $this->render('columns_definitions/column_definitions_form', $templateData);
     }
 }
diff --git a/libraries/classes/Controllers/Table/CreateController.php b/libraries/classes/Controllers/Table/CreateController.php
@@ -168,14 +168,16 @@ public function index(): void
         // This global variable needs to be reset for the header class to function properly
         $table = '';
 
-        ColumnsDefinition::displayForm(
-            $this->response,
-            $this->template,
+        $this->addScriptFiles(['vendor/jquery/jquery.uitablefilter.js', 'indexes.js']);
+
+        $templateData = ColumnsDefinition::displayForm(
             $this->transformations,
             $this->relation,
             $this->dbi,
             $action,
             $num_fields
         );
+
+        $this->render('columns_definitions/column_definitions_form', $templateData);
     }
 }
diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php
@@ -776,9 +776,9 @@ protected function displayHtmlForColumnChange($selected)
         $checkUserPrivileges = new CheckUserPrivileges($this->dbi);
         $checkUserPrivileges->getPrivileges();
 
-        ColumnsDefinition::displayForm(
-            $this->response,
-            $this->template,
+        $this->addScriptFiles(['vendor/jquery/jquery.uitablefilter.js', 'indexes.js']);
+
+        $templateData = ColumnsDefinition::displayForm(
             $this->transformations,
             $this->relation,
             $this->dbi,
@@ -788,6 +788,8 @@ protected function displayHtmlForColumnChange($selected)
             $selected,
             $fields_meta
         );
+
+        $this->render('columns_definitions/column_definitions_form', $templateData);
     }
 
     public function partitioning(): void

diff --git a/libraries/classes/Table/ColumnsDefinition.php b/libraries/classes/Table/ColumnsDefinition.php
@@ -10,11 +10,9 @@
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Partition;
 use PhpMyAdmin\Relation;
-use PhpMyAdmin\Response;
 use PhpMyAdmin\StorageEngine;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\TablePartitionDefinition;
-use PhpMyAdmin\Template;
 use PhpMyAdmin\Transformations;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
@@ -40,8 +38,6 @@
 final class ColumnsDefinition
 {
     /**
-     * @param Response          $response        Response object
-     * @param Template          $template        Template
      * @param Transformations   $transformations Transformations
      * @param Relation          $relation        Relation
      * @param DatabaseInterface $dbi             Database Interface instance
@@ -51,10 +47,10 @@ final class ColumnsDefinition
      * @param array|null        $selected        Selected
      * @param array|null        $fields_meta     Fields meta
      * @param array|null        $field_fulltext  Fields full text
+     *
+     * @return array<string, mixed>
      */
     public static function displayForm(
-        Response $response,
-        Template $template,
         Transformations $transformations,
         Relation $relation,
         DatabaseInterface $dbi,
@@ -64,7 +60,7 @@ public static function displayForm(
         $selected = null,
         $fields_meta = null,
         $field_fulltext = null
-    ): void {
+    ): array {
         global $db, $table, $cfg, $col_priv, $is_reload_priv, $mime_map;
 
         Util::checkParameters([
@@ -520,7 +516,7 @@ public static function displayForm(
 
         $storageEngines = StorageEngine::getArray();
 
-        $html = $template->render('columns_definitions/column_definitions_form', [
+        return [
             'is_backup' => $is_backup,
             'fields_meta' => $fields_meta ?? null,
             'mimework' => $cfgRelation['mimework'],
@@ -553,14 +549,6 @@ public static function displayForm(
             'have_partitioning' => Partition::havePartitioning(),
             'dbi' => $dbi,
             'disable_is' => $cfg['Server']['DisableIS'],
-        ]);
-
-        $response->getHeader()->getScripts()->addFiles(
-            [
-                'vendor/jquery/jquery.uitablefilter.js',
-                'indexes.js',
-            ]
-        );
-        $response->addHTML($html);
+        ];
     }
 }