Refactor getMenu() method

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
phpmyadmin · Nov 28, 2021 · b604a86 · b604a86
1 parent 66e1357
commit b604a86
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php
@@ -11,7 +11,7 @@
 use PhpMyAdmin\Utils\SessionCache;
 
 use function __;
-use function array_key_exists;
+use function array_intersect_key;
 use function count;
 use function in_array;
 use function mb_strpos;
@@ -84,15 +84,13 @@ private function getMenu(): string
     {
         $urlParams = [];
 
-        $hasDbArg = strlen($this->db) > 0;
-
         // The URL will not work if the table is defined without a database
-        if (strlen((string) $this->table) > 0 && $hasDbArg) {
+        if ($this->table !== '' && $this->db !== '') {
             $tabs = $this->getTableTabs();
             $urlParams['db'] = $this->db;
             $urlParams['table'] = $this->table;
             $level = 'table';
-        } elseif ($hasDbArg) {
+        } elseif ($this->db !== '') {
             $tabs = $this->getDbTabs();
             $urlParams['db'] = $this->db;
             $level = 'db';
@@ -102,13 +100,8 @@ private function getMenu(): string
         }
 
         $allowedTabs = $this->getAllowedTabs($level);
-        foreach ($tabs as $key => $value) {
-            if (array_key_exists($key, $allowedTabs)) {
-                continue;
-            }
-
-            unset($tabs[$key]);
-        }
+        // Filter out any tabs that are not allowed
+        $tabs = array_intersect_key($tabs, $allowedTabs);
 
         return $this->template->render('top_menu', [
             'tabs' => $tabs,

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -8554,10 +8554,9 @@
       <code>$row['tab']</code>
       <code>$row['tab']</code>
     </MixedArgument>
-    <MixedAssignment occurrences="3">
+    <MixedAssignment occurrences="2">
       <code>$binaryLogs</code>
       <code>$result</code>
-      <code>$value</code>
     </MixedAssignment>
     <MixedInferredReturnType occurrences="1">
       <code>array</code>
@@ -8578,13 +8577,9 @@
     <PossiblyNullArrayAccess occurrences="1">
       <code>$allowedTabs[$tabName]</code>
     </PossiblyNullArrayAccess>
-    <RedundantCastGivenDocblockType occurrences="2">
-      <code>(string) $this-&gt;table</code>
+    <RedundantCastGivenDocblockType occurrences="1">
       <code>(string) $this-&gt;table</code>
     </RedundantCastGivenDocblockType>
-    <UnusedForeachValue occurrences="1">
-      <code>$value</code>
-    </UnusedForeachValue>
   </file>
   <file src="libraries/classes/Message.php">
     <DocblockTypeContradiction occurrences="1">