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

Refactor deleteSave()

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

10
phpstan-baseline.neon
View File

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

4
psalm-baseline.xml
View File

@ -849,10 +849,6 @@
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<MixedArgument>
<code><![CDATA[$params['col_name']]]></code>
<code><![CDATA[$params['db']]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['message']]]></code>
</MixedAssignment>

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

@ -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);
}
}