gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor editPage()

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2024-10-21 15:51:21 +01:00
parent 39898ace83
commit a6903274cf
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpstan-baseline.neon
View File

@ -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

1
psalm-baseline.xml
View File

@ -852,7 +852,6 @@
<MixedArgument>
<code><![CDATA[$params['col_name']]]></code>
<code><![CDATA[$params['db']]]></code>
<code><![CDATA[$params['db']]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['message']]]></code>

21
src/Controllers/Database/CentralColumnsController.php
View File

@ -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 */