Replace POST-var access with Serverrequest object - pt 2 (#17787)

clxswalther · MauricioFauth · web-flow · commit edfe8a5881ff · 2022-10-19T22:06:35.000-03:00
* Use ServerRequestObject to access POST-vars

Signed-off-by: Sebastian Walther &lt;swalther@complex-it.de&gt;
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
Co-authored-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Controllers/Table/Structure/AddIndexController.php b/libraries/classes/Controllers/Table/Structure/AddIndexController.php
@@ -39,7 +39,7 @@ public function __invoke(ServerRequest $request): void
     {
         $GLOBALS['message'] = $GLOBALS['message'] ?? null;
 
-        $selected = $_POST['selected_fld'] ?? [];
+        $selected = $request->getParsedBodyParam('selected_fld', []);
 
         if (empty($selected)) {
             $this->response->setRequestStatus(false);
diff --git a/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php b/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php
@@ -37,7 +37,7 @@ public function __invoke(ServerRequest $request): void
     {
         $GLOBALS['message'] = $GLOBALS['message'] ?? null;
 
-        $selected = $_POST['selected_fld'] ?? [];
+        $selected = $request->getParsedBodyParam('selected_fld', []);
 
         if (empty($selected)) {
             $this->response->setRequestStatus(false);
diff --git a/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php b/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php
@@ -37,7 +37,7 @@ public function __invoke(ServerRequest $request): void
     {
         $GLOBALS['message'] = $GLOBALS['message'] ?? null;
 
-        $selected = $_POST['selected_fld'] ?? [];
+        $selected = $request->getParsedBodyParam('selected_fld', []);
 
         if (empty($selected)) {
             $this->response->setRequestStatus(false);
diff --git a/libraries/classes/Controllers/Table/Structure/ChangeController.php b/libraries/classes/Controllers/Table/Structure/ChangeController.php
@@ -43,7 +43,7 @@ public function __invoke(ServerRequest $request): void
             return;
         }
 
-        $selected = $_POST['selected_fld'] ?? [];
+        $selected = $request->getParsedBodyParam('selected_fld', []);
 
         if (empty($selected)) {
             $this->response->setRequestStatus(false);
diff --git a/libraries/classes/Controllers/Table/Structure/FulltextController.php b/libraries/classes/Controllers/Table/Structure/FulltextController.php
@@ -39,7 +39,7 @@ public function __invoke(ServerRequest $request): void
     {
         $GLOBALS['message'] = $GLOBALS['message'] ?? null;
 
-        $selected = $_POST['selected_fld'] ?? [];
+        $selected = $request->getParsedBodyParam('selected_fld', []);
 
         if (empty($selected)) {
             $this->response->setRequestStatus(false);
diff --git a/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php b/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php
@@ -44,7 +44,8 @@ public function __construct(
 
     public function __invoke(ServerRequest $request): void
     {
-        if (! isset($_POST['move_columns']) || ! is_array($_POST['move_columns']) || ! $this->response->isAjax()) {
+        $move_columns = $request->getParsedBodyParam('move_columns');
+        if (! isset($move_columns) || ! is_array($move_columns) || ! $this->response->isAjax()) {
             return;
         }
 
@@ -61,8 +62,8 @@ public function __invoke(ServerRequest $request): void
         $usesLiteralNull = $this->dbi->isMariaDB() && $this->dbi->getVersion() >= 100200;
         $defaultNullValue = $usesLiteralNull ? 'NULL' : null;
         // move columns from first to last
-        for ($i = 0, $l = count($_POST['move_columns']); $i < $l; $i++) {
-            $column = $_POST['move_columns'][$i];
+        for ($i = 0, $l = count($move_columns); $i < $l; $i++) {
+            $column = $move_columns[$i];
             // is this column already correctly placed?
             if ($column_names[$i] == $column) {
                 continue;
diff --git a/libraries/classes/Controllers/Table/Structure/PrimaryController.php b/libraries/classes/Controllers/Table/Structure/PrimaryController.php
@@ -43,8 +43,8 @@ public function __invoke(ServerRequest $request): void
         $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null;
         $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null;
 
-        $selected = $_POST['selected'] ?? [];
-        $selected_fld = $_POST['selected_fld'] ?? [];
+        $selected = $request->getParsedBodyParam('selected', []);
+        $selected_fld = $request->getParsedBodyParam('selected_fld', []);
 
         if (empty($selected) && empty($selected_fld)) {
             $this->response->setRequestStatus(false);
diff --git a/libraries/classes/Controllers/Table/Structure/ReservedWordCheckController.php b/libraries/classes/Controllers/Table/Structure/ReservedWordCheckController.php
@@ -24,7 +24,7 @@ public function __invoke(ServerRequest $request): void
             return;
         }
 
-        $columns_names = $_POST['field_name'];
+        $columns_names = $request->getParsedBodyParam('field_name');
         $reserved_keywords_names = [];
         foreach ($columns_names as $column) {
             if (! Context::isKeyword(trim($column), true)) {
diff --git a/libraries/classes/Controllers/Table/Structure/SpatialController.php b/libraries/classes/Controllers/Table/Structure/SpatialController.php
@@ -39,7 +39,7 @@ public function __invoke(ServerRequest $request): void
     {
         $GLOBALS['message'] = $GLOBALS['message'] ?? null;
 
-        $selected = $_POST['selected_fld'] ?? [];
+        $selected = $request->getParsedBodyParam('selected_fld', []);
 
         if (empty($selected)) {
             $this->response->setRequestStatus(false);
diff --git a/libraries/classes/Controllers/Table/Structure/UniqueController.php b/libraries/classes/Controllers/Table/Structure/UniqueController.php
@@ -39,7 +39,7 @@ public function __invoke(ServerRequest $request): void
     {
         $GLOBALS['message'] = $GLOBALS['message'] ?? null;
 
-        $selected = $_POST['selected_fld'] ?? [];
+        $selected = $request->getParsedBodyParam('selected_fld', []);
 
         if (empty($selected)) {
             $this->response->setRequestStatus(false);
diff --git a/test/classes/Controllers/Table/Structure/SpatialControllerTest.php b/test/classes/Controllers/Table/Structure/SpatialControllerTest.php
@@ -23,14 +23,16 @@ public function testAddSpatialKeyToSingleField(): void
         $GLOBALS['table'] = 'test_table';
         $GLOBALS['message'] = null;
         $GLOBALS['sql_query'] = null;
-        $_POST['selected_fld'] = ['test_field'];
 
         $dbiDummy = $this->createDbiDummy();
         $dbiDummy->addSelectDb('test_db');
         $dbiDummy->addResult('ALTER TABLE `test_table` ADD SPATIAL(`test_field`);', []);
         $dbi = $this->createDatabaseInterface($dbiDummy);
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
+        $request->method('getParsedBodyParam')->willReturnMap([
+            ['selected_fld', [], ['test_field']],
+        ]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->once())->method('__invoke')->with($request);
 
@@ -50,14 +52,16 @@ public function testAddSpatialKeyToMultipleFields(): void
         $GLOBALS['table'] = 'test_table';
         $GLOBALS['message'] = null;
         $GLOBALS['sql_query'] = null;
-        $_POST['selected_fld'] = ['test_field1', 'test_field2'];
 
         $dbiDummy = $this->createDbiDummy();
         $dbiDummy->addSelectDb('test_db');
         $dbiDummy->addResult('ALTER TABLE `test_table` ADD SPATIAL(`test_field1`, `test_field2`);', []);
         $dbi = $this->createDatabaseInterface($dbiDummy);
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
+        $request->method('getParsedBodyParam')->willReturnMap([
+            ['selected_fld', [], ['test_field1', 'test_field2']],
+        ]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->once())->method('__invoke')->with($request);
 
@@ -77,11 +81,13 @@ public function testNoColumnsSelected(): void
         $GLOBALS['table'] = 'test_table';
         $GLOBALS['message'] = null;
         $GLOBALS['sql_query'] = null;
-        $_POST['selected_fld'] = null;
 
         $dbi = $this->createDatabaseInterface();
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
+        $request->method('getParsedBodyParam')->willReturnMap([
+            ['selected_fld', [], null],
+        ]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->never())->method('__invoke');
         $response = new ResponseRenderer();
@@ -103,7 +109,6 @@ public function testAddSpatialKeyWithError(): void
         $GLOBALS['table'] = 'test_table';
         $GLOBALS['message'] = null;
         $GLOBALS['sql_query'] = null;
-        $_POST['selected_fld'] = ['test_field'];
 
         $dbiDummy = $this->createDbiDummy();
         $dbiDummy->addSelectDb('test_db');
@@ -112,6 +117,9 @@ public function testAddSpatialKeyWithError(): void
         $dbi = $this->createDatabaseInterface($dbiDummy);
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
+        $request->method('getParsedBodyParam')->willReturnMap([
+            ['selected_fld', [], ['test_field']],
+        ]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->once())->method('__invoke')->with($request);
 
diff --git a/test/classes/Controllers/Table/Structure/UniqueControllerTest.php b/test/classes/Controllers/Table/Structure/UniqueControllerTest.php
@@ -23,14 +23,16 @@ public function testAddUniqueKeyToSingleField(): void
         $GLOBALS['table'] = 'test_table';
         $GLOBALS['message'] = null;
         $GLOBALS['sql_query'] = null;
-        $_POST['selected_fld'] = ['test_field'];
 
         $dbiDummy = $this->createDbiDummy();
         $dbiDummy->addSelectDb('test_db');
         $dbiDummy->addResult('ALTER TABLE `test_table` ADD UNIQUE(`test_field`);', []);
         $dbi = $this->createDatabaseInterface($dbiDummy);
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
+        $request->method('getParsedBodyParam')->willReturnMap([
+            ['selected_fld', [], ['test_field']],
+        ]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->once())->method('__invoke')->with($request);
 
@@ -50,14 +52,16 @@ public function testAddUniqueKeyToMultipleFields(): void
         $GLOBALS['table'] = 'test_table';
         $GLOBALS['message'] = null;
         $GLOBALS['sql_query'] = null;
-        $_POST['selected_fld'] = ['test_field1', 'test_field2'];
 
         $dbiDummy = $this->createDbiDummy();
         $dbiDummy->addSelectDb('test_db');
         $dbiDummy->addResult('ALTER TABLE `test_table` ADD UNIQUE(`test_field1`, `test_field2`);', []);
         $dbi = $this->createDatabaseInterface($dbiDummy);
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
+        $request->method('getParsedBodyParam')->willReturnMap([
+            ['selected_fld', [], ['test_field1', 'test_field2']],
+        ]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->once())->method('__invoke')->with($request);
 
@@ -77,11 +81,13 @@ public function testNoColumnsSelected(): void
         $GLOBALS['table'] = 'test_table';
         $GLOBALS['message'] = null;
         $GLOBALS['sql_query'] = null;
-        $_POST['selected_fld'] = null;
 
         $dbi = $this->createDatabaseInterface();
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
+        $request->method('getParsedBodyParam')->willReturnMap([
+            ['selected_fld', [], null],
+        ]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->never())->method('__invoke');
         $response = new ResponseRenderer();
@@ -103,7 +109,6 @@ public function testAddUniqueKeyWithError(): void
         $GLOBALS['table'] = 'test_table';
         $GLOBALS['message'] = null;
         $GLOBALS['sql_query'] = null;
-        $_POST['selected_fld'] = ['test_field'];
 
         $dbiDummy = $this->createDbiDummy();
         $dbiDummy->addSelectDb('test_db');
@@ -112,6 +117,9 @@ public function testAddUniqueKeyWithError(): void
         $dbi = $this->createDatabaseInterface($dbiDummy);
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
+        $request->method('getParsedBodyParam')->willReturnMap([
+            ['selected_fld', [], ['test_field']],
+        ]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->once())->method('__invoke')->with($request);
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function __invoke(ServerRequest $request): void`
`39`	`39`	`{`
`40`	`40`	`$GLOBALS['message'] = $GLOBALS['message'] ?? null;`
`41`	`41`
`42`		`- $selected = $_POST['selected_fld'] ?? [];`
	`42`	`+ $selected = $request->getParsedBodyParam('selected_fld', []);`
`43`	`43`
`44`	`44`	`if (empty($selected)) {`
`45`	`45`	`$this->response->setRequestStatus(false);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __invoke(ServerRequest $request): void`
`37`	`37`	`{`
`38`	`38`	`$GLOBALS['message'] = $GLOBALS['message'] ?? null;`
`39`	`39`
`40`		`- $selected = $_POST['selected_fld'] ?? [];`
	`40`	`+ $selected = $request->getParsedBodyParam('selected_fld', []);`
`41`	`41`
`42`	`42`	`if (empty($selected)) {`
`43`	`43`	`$this->response->setRequestStatus(false);`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __invoke(ServerRequest $request): void`
`43`	`43`	`return;`
`44`	`44`	`}`
`45`	`45`
`46`		`- $selected = $_POST['selected_fld'] ?? [];`
	`46`	`+ $selected = $request->getParsedBodyParam('selected_fld', []);`
`47`	`47`
`48`	`48`	`if (empty($selected)) {`
`49`	`49`	`$this->response->setRequestStatus(false);`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function __invoke(ServerRequest $request): void`
`24`	`24`	`return;`
`25`	`25`	`}`
`26`	`26`
`27`		`- $columns_names = $_POST['field_name'];`
	`27`	`+ $columns_names = $request->getParsedBodyParam('field_name');`
`28`	`28`	`$reserved_keywords_names = [];`
`29`	`29`	`foreach ($columns_names as $column) {`
`30`	`30`	`if (! Context::isKeyword(trim($column), true)) {`