Remove container builder from ReplaceController

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Nov 3, 2023 · 550673b · 550673b
1 parent 99f7145
commit 550673b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 41 deletions.
diff --git a/app/services_controllers.php b/app/services_controllers.php
@@ -1352,6 +1352,10 @@
                 '$transformations' => '@transformations',
                 '$relation' => '@relation',
                 '$dbi' => '@dbi',
+                '$sqlController' => '@' . Sql\SqlController::class,
+                '$databaseSqlController' => '@' . Database\SqlController::class,
+                '$changeController' => '@' . Table\ChangeController::class,
+                '$tableSqlController' => '@' . Table\SqlController::class,
             ],
         ],
         Table\SearchController::class => [

diff --git a/src/Controllers/Table/ReplaceController.php b/src/Controllers/Table/ReplaceController.php
@@ -49,6 +49,10 @@ public function __construct(
         private Transformations $transformations,
         private Relation $relation,
         private DatabaseInterface $dbi,
+        private readonly SqlController $sqlController,
+        private readonly DatabaseSqlController $databaseSqlController,
+        private readonly ChangeController $changeController,
+        private readonly TableSqlController $tableSqlController,
     ) {
         parent::__construct($response, $template);
     }
@@ -475,44 +479,25 @@ private function doTransformations(array $mimeMap, ServerRequest $request): void
     private function moveBackToCallingScript(string $gotoInclude, ServerRequest $request): void
     {
         $GLOBALS['active_page'] = $gotoInclude;
-        $container = Core::getContainerBuilder();
         if ($gotoInclude === '/sql') {
-            /** @var SqlController $controller */
-            $controller = $container->get(SqlController::class);
-            $controller($request);
+            ($this->sqlController)($request);
 
             return;
         }
 
         if ($gotoInclude === '/database/sql') {
-            /** @var DatabaseSqlController $controller */
-            $controller = $container->get(DatabaseSqlController::class);
-            $controller($request);
-
-            return;
-        }
-
-        if ($gotoInclude === '/table/change') {
-            /** @var ChangeController $controller */
-            $controller = $container->get(ChangeController::class);
-            $controller($request);
+            ($this->databaseSqlController)($request);
 
             return;
         }
 
         if ($gotoInclude === '/table/sql') {
-            /** @var TableSqlController $controller */
-            $controller = $container->get(TableSqlController::class);
-            $controller($request);
+            ($this->tableSqlController)($request);
 
             return;
         }
 
-        /**
-         * Load target page.
-         */
-        /** @psalm-suppress UnresolvableInclude */
-        require ROOT_PATH . Core::securePath($gotoInclude);
+        ($this->changeController)($request);
     }
 
     /**

diff --git a/src/Controllers/Table/SqlController.php b/src/Controllers/Table/SqlController.php
@@ -24,7 +24,7 @@
 /**
  * Table SQL executor
  */
-final class SqlController extends AbstractController
+class SqlController extends AbstractController
 {
     public function __construct(
         ResponseRenderer $response,

diff --git a/test/classes/Controllers/Table/ReplaceControllerTest.php b/test/classes/Controllers/Table/ReplaceControllerTest.php
@@ -11,8 +11,11 @@
 use PhpMyAdmin\ConfigStorage\Relation;
 use PhpMyAdmin\ConfigStorage\RelationCleanup;
 use PhpMyAdmin\ConfigStorage\RelationParameters;
+use PhpMyAdmin\Controllers\Database\SqlController as DatabaseSqlController;
 use PhpMyAdmin\Controllers\Sql\SqlController;
+use PhpMyAdmin\Controllers\Table\ChangeController;
 use PhpMyAdmin\Controllers\Table\ReplaceController;
+use PhpMyAdmin\Controllers\Table\SqlController as TableSqlController;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\FileListing;
 use PhpMyAdmin\Http\ServerRequest;
@@ -26,7 +29,6 @@
 use PhpMyAdmin\Transformations;
 use PHPUnit\Framework\Attributes\CoversClass;
 use ReflectionProperty;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 #[CoversClass(ReplaceController::class)]
 class ReplaceControllerTest extends AbstractTestCase
@@ -99,14 +101,6 @@ public function testReplace(): void
         $transformations = new Transformations();
         $template = new Template();
         $response = new ResponseRenderer();
-        $replaceController = new ReplaceController(
-            $response,
-            $template,
-            new InsertEdit($dbi, $relation, $transformations, new FileListing(), $template),
-            $transformations,
-            $relation,
-            $dbi,
-        );
 
         $pageSettings = $this->createStub(PageSettings::class);
         $bookmarkRepository = new BookmarkRepository($dbi, $relation);
@@ -127,8 +121,19 @@ public function testReplace(): void
             $pageSettings,
             $bookmarkRepository,
         );
-        $GLOBALS['containerBuilder'] = $this->createStub(ContainerBuilder::class);
-        $GLOBALS['containerBuilder']->method('get')->willReturn($sqlController);
+
+        $replaceController = new ReplaceController(
+            $response,
+            $template,
+            new InsertEdit($dbi, $relation, $transformations, new FileListing(), $template),
+            $transformations,
+            $relation,
+            $dbi,
+            $sqlController,
+            self::createStub(DatabaseSqlController::class),
+            self::createStub(ChangeController::class),
+            self::createStub(TableSqlController::class),
+        );
 
         $GLOBALS['goto'] = 'index.php?route=/sql';
         $dummyDbi->addSelectDb('my_db');
@@ -155,12 +160,16 @@ public function testGetParamsForUpdateOrInsert(): void
         ]);
 
         $replaceController = new ReplaceController(
-            $this->createStub(ResponseRenderer::class),
-            $this->createStub(Template::class),
-            $this->createStub(InsertEdit::class),
-            $this->createStub(Transformations::class),
-            $this->createStub(Relation::class),
-            $this->createStub(DatabaseInterface::class),
+            self::createStub(ResponseRenderer::class),
+            self::createStub(Template::class),
+            self::createStub(InsertEdit::class),
+            self::createStub(Transformations::class),
+            self::createStub(Relation::class),
+            self::createStub(DatabaseInterface::class),
+            self::createStub(SqlController::class),
+            self::createStub(DatabaseSqlController::class),
+            self::createStub(ChangeController::class),
+            self::createStub(TableSqlController::class),
         );
 
         /** @var array $result */