diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 70e838b82b..a1c7d177c3 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1420,16 +1420,6 @@ parameters: count: 1 path: src/Controllers/Database/CentralColumnsController.php - - - message: "#^Parameter \\#1 \\$database of method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:deleteColumnsFromList\\(\\) expects string, mixed given\\.$#" - count: 1 - path: src/Controllers/Database/CentralColumnsController.php - - - - message: "#^Parameter \\#1 \\$string of function parse_str expects string, mixed given\\.$#" - count: 1 - path: src/Controllers/Database/CentralColumnsController.php - - message: "#^Cannot access offset string on mixed\\.$#" count: 1 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 9ca7b57f6d..7bab0fe34f 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -849,10 +849,6 @@ - - - - diff --git a/src/Controllers/Database/CentralColumnsController.php b/src/Controllers/Database/CentralColumnsController.php index 7a9e5119c6..5715fd4450 100644 --- a/src/Controllers/Database/CentralColumnsController.php +++ b/src/Controllers/Database/CentralColumnsController.php @@ -120,10 +120,7 @@ final class CentralColumnsController implements InvocableController } if ($request->hasBodyParam('delete_save')) { - $tmpMsg = $this->deleteSave([ - 'db' => $request->getParsedBodyParam('db'), - 'col_name' => $request->getParsedBodyParam('col_name'), - ]); + $tmpMsg = $this->deleteSave($request, $db); } $this->main( @@ -245,15 +242,13 @@ final class CentralColumnsController implements InvocableController ]); } - /** @param mixed[] $params Request parameters */ - public function deleteSave(array $params): true|Message + public function deleteSave(ServerRequest $request, DatabaseName $db): true|Message { - $name = []; - parse_str($params['col_name'], $name); + parse_str($request->getParsedBodyParamAsString('col_name'), $name); Assert::isArray($name['selected_fld']); Assert::allString($name['selected_fld']); - return $this->centralColumns->deleteColumnsFromList($params['db'], $name['selected_fld'], false); + return $this->centralColumns->deleteColumnsFromList($db->getName(), $name['selected_fld'], false); } }