diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 21c8adc0ce..70e838b82b 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1430,11 +1430,6 @@ parameters:
count: 1
path: src/Controllers/Database/CentralColumnsController.php
- -
- message: "#^Parameter \\#2 \\$selectedDb of method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:getHtmlForEditingPage\\(\\) 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 a1814ee622..9ca7b57f6d 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -852,7 +852,6 @@
-
diff --git a/src/Controllers/Database/CentralColumnsController.php b/src/Controllers/Database/CentralColumnsController.php
index 0d6957ac91..7a9e5119c6 100644
--- a/src/Controllers/Database/CentralColumnsController.php
+++ b/src/Controllers/Database/CentralColumnsController.php
@@ -80,7 +80,7 @@ final class CentralColumnsController implements InvocableController
if ($request->hasBodyParam('add_column')) {
$tmpMsg = $this->centralColumns->syncUniqueColumns(
- DatabaseName::from($request->getParsedBodyParam('db')),
+ $db,
[$request->getParsedBodyParamAsString('column-select')],
false,
$request->getParsedBodyParamAsString('table-select'),
@@ -94,10 +94,7 @@ final class CentralColumnsController implements InvocableController
]);
if ($request->hasBodyParam('edit_central_columns_page')) {
- $this->editPage([
- 'selected_fld' => $request->getParsedBodyParam('selected_fld'),
- 'db' => $request->getParsedBodyParam('db'),
- ]);
+ $this->editPage($request, $db);
return $this->response->response();
}
@@ -238,14 +235,14 @@ final class CentralColumnsController implements InvocableController
);
}
- /** @param mixed[] $params Request parameters */
- public function editPage(array $params): void
+ public function editPage(ServerRequest $request, DatabaseName $db): void
{
- Assert::isArray($params['selected_fld']);
- Assert::allString($params['selected_fld']);
- $rows = $this->centralColumns->getHtmlForEditingPage($params['selected_fld'], $params['db']);
-
- $this->response->render('database/central_columns/edit', ['rows' => $rows]);
+ $selectedFields = $request->getParsedBodyParam('selected_fld');
+ Assert::isArray($selectedFields);
+ Assert::allString($selectedFields);
+ $this->response->render('database/central_columns/edit', [
+ 'rows' => $this->centralColumns->getHtmlForEditingPage($selectedFields, $db->getName()),
+ ]);
}
/** @param mixed[] $params Request parameters */