From cd9ca8419ad33772c2851f71823645676562e140 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Sun, 2 Apr 2023 23:34:03 +0100 Subject: [PATCH] Use array_fill_keys Signed-off-by: Kamil Tekiela --- libraries/classes/ConfigStorage/Relation.php | 9 +++------ phpstan-baseline.neon | 5 ----- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/libraries/classes/ConfigStorage/Relation.php b/libraries/classes/ConfigStorage/Relation.php index 92df58cfac..8774a9cd56 100644 --- a/libraries/classes/ConfigStorage/Relation.php +++ b/libraries/classes/ConfigStorage/Relation.php @@ -19,6 +19,7 @@ use PhpMyAdmin\Util; use PhpMyAdmin\Version; use function __; +use function array_fill_keys; use function array_keys; use function array_reverse; use function array_search; @@ -220,9 +221,6 @@ class Relation */ private function checkRelationsParam(): array { - $relationParams = []; - $relationParams['version'] = Version::VERSION; - $workToTable = [ 'relwork' => 'relation', 'displaywork' => ['relation', 'table_info'], @@ -244,10 +242,9 @@ class Relation 'exporttemplateswork' => 'export_templates', ]; - foreach (array_keys($workToTable) as $work) { - $relationParams[$work] = false; - } + $relationParams = array_fill_keys(array_keys($workToTable), false); + $relationParams['version'] = Version::VERSION; $relationParams['allworks'] = false; $relationParams['user'] = null; $relationParams['db'] = null; diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index a5db805617..ebee3ff013 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -710,11 +710,6 @@ parameters: count: 1 path: libraries/classes/ConfigStorage/Relation.php - - - message: "#^Foreach overwrites \\$work with its key variable\\.$#" - count: 1 - path: libraries/classes/ConfigStorage/Relation.php - - message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:getDisplayField\\(\\) should return string\\|false but returns mixed\\.$#" count: 1