Introduce the ServerRequest object to AddFieldController

MauricioFauth · MauricioFauth · commit 9550066810cd · 2022-05-04T15:55:22.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Controllers/Table/AddFieldController.php b/libraries/classes/Controllers/Table/AddFieldController.php
@@ -11,6 +11,7 @@
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\DbTableExists;
 use PhpMyAdmin\Html\Generator;
+use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Table\ColumnsDefinition;
@@ -22,6 +23,7 @@
 use function __;
 use function intval;
 use function is_array;
+use function is_numeric;
 use function min;
 use function strlen;
 
@@ -57,7 +59,7 @@ public function __construct(
         $this->columnsDefinition = $columnsDefinition;
     }
 
-    public function __invoke(): void
+    public function __invoke(ServerRequest $request): void
     {
         $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null;
         $GLOBALS['message'] = $GLOBALS['message'] ?? null;
@@ -66,6 +68,9 @@ public function __invoke(): void
         $GLOBALS['regenerate'] = $GLOBALS['regenerate'] ?? null;
         $GLOBALS['result'] = $GLOBALS['result'] ?? null;
 
+        /** @var string|null $numberOfFields */
+        $numberOfFields = $request->getParsedBodyParam('num_fields');
+
         $this->addScriptFiles(['table/structure.js']);
 
         $this->checkParameters(['db', 'table']);
@@ -95,8 +100,8 @@ public function __invoke(): void
                 4096
             );
             $GLOBALS['regenerate'] = true;
-        } elseif (isset($_POST['num_fields']) && intval($_POST['num_fields']) > 0) {
-            $GLOBALS['num_fields'] = min(4096, intval($_POST['num_fields']));
+        } elseif (is_numeric($numberOfFields) && $numberOfFields > 0) {
+            $GLOBALS['num_fields'] = min(4096, (int) $numberOfFields);
         } else {
             $GLOBALS['num_fields'] = 1;
         }
diff --git a/test/classes/Controllers/Table/AddFieldControllerTest.php b/test/classes/Controllers/Table/AddFieldControllerTest.php
@@ -7,6 +7,7 @@
 use PhpMyAdmin\Config;
 use PhpMyAdmin\ConfigStorage\Relation;
 use PhpMyAdmin\Controllers\Table\AddFieldController;
+use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\Table\ColumnsDefinition;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Tests\AbstractTestCase;
@@ -250,6 +251,9 @@ public function testInvoke(): void
             'disable_is' => true,
         ]);
 
+        $request = $this->createStub(ServerRequest::class);
+        $request->method('getParsedBodyParam')->willReturnMap([['num_fields', null, '1']]);
+
         $transformations = new Transformations();
         (new AddFieldController(
             $response,
@@ -258,7 +262,7 @@ public function testInvoke(): void
             new Config(),
             $dbi,
             new ColumnsDefinition($dbi, $relation, $transformations)
-        ))();
+        ))($request);
 
         $this->assertSame($expected, $response->getHTMLResult());
     }
