Remove the table structure entry point file

Directly calls the controller instead of including the file. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Jan 7, 2020 · 96ee3b8 · 96ee3b8
1 parent 7837ab8
commit 96ee3b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/libraries/classes/Controllers/Table/IndexesController.php b/libraries/classes/Controllers/Table/IndexesController.php
@@ -140,6 +140,8 @@ public function displayForm(Index $index): void
      */
     public function doSaveData(Index $index): void
     {
+        global $containerBuilder;
+
         $error = false;
 
         $sql_query = $this->dbi->getTable($this->db, $this->table)
@@ -171,7 +173,9 @@ public function doSaveData(Index $index): void
                     )
                 );
             } else {
-                include ROOT_PATH . 'libraries/entry_points/table/structure.php';
+                /** @var StructureController $controller */
+                $controller = $containerBuilder->get(StructureController::class);
+                $controller->index();
             }
         } else {
             $this->response->setRequestStatus(false);

diff --git a/libraries/classes/Controllers/ViewCreateController.php b/libraries/classes/Controllers/ViewCreateController.php
@@ -6,6 +6,7 @@
 
 namespace PhpMyAdmin\Controllers;
 
+use PhpMyAdmin\Controllers\Table\StructureController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Html\Generator;
 use PhpMyAdmin\Message;
@@ -26,7 +27,7 @@ public function index(): void
     {
         global $text_dir, $url_params, $view_algorithm_options, $view_with_options, $view_security_options;
         global $message, $sep, $sql_query, $arr, $view_columns, $column_map, $systemDb, $pma_transformation_data;
-        global $new_transformations_sql, $view, $item, $parts, $db;
+        global $containerBuilder, $new_transformations_sql, $view, $item, $parts, $db;
 
         require ROOT_PATH . 'libraries/db_common.inc.php';
 
@@ -164,7 +165,9 @@ public function index(): void
 
             if (! isset($_POST['ajax_dialog'])) {
                 $message = Message::success();
-                include ROOT_PATH . 'libraries/entry_points/table/structure.php';
+                /** @var StructureController $controller */
+                $controller = $containerBuilder->get(StructureController::class);
+                $controller->index();
             } else {
                 $this->response->addJSON(
                     'message',

diff --git a/libraries/entry_points/table/structure.php b/libraries/entry_points/table/structure.php