From c959a04a46e24c9ca9f91646c5e325ee358f7bb0 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Thu, 14 Mar 2024 13:52:09 +0100
Subject: [PATCH] Fix baselines after merge

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 phpstan-baseline.neon | 10 +++++-----
 psalm-baseline.xml    | 30 +++---------------------------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 2d4ddef8fa..004f9da8ba 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -9255,6 +9255,11 @@ parameters:
 			count: 4
 			path: src/Navigation/NavigationTree.php
 
+		-
+			message: "#^Method PhpMyAdmin\\\\Navigation\\\\NavigationTree\\:\\:parsePath\\(\\) should return non\\-empty\\-array\\<int, string\\> but returns non\\-empty\\-array\\<int, string\\|false\\>\\.$#"
+			count: 1
+			path: src/Navigation/NavigationTree.php
+
 		-
 			message: "#^Only booleans are allowed in &&, int given on the right side\\.$#"
 			count: 5
@@ -12875,11 +12880,6 @@ parameters:
 			count: 1
 			path: src/Server/Plugins.php
 
-		-
-			message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: src/Server/Privileges.php
-
 		-
 			message: "#^Cannot access offset 'CHARACTER_MAXIMUM…' on mixed\\.$#"
 			count: 2
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 5f67152a9b..fb8d150fd6 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
+<files psalm-version="5.23.0@005e3184fb6de4350a873b9b8c4dc3cede9db762">
   <file src="app/services_loader.php">
     <MixedArgument>
       <code><![CDATA[$argumentName]]></code>
@@ -833,9 +833,6 @@
       <code><![CDATA[$userGroups]]></code>
       <code><![CDATA[$userGroups[$groupName]]]></code>
     </PossiblyNullArrayOffset>
-    <RiskyTruthyFalsyComparison>
-      <code><![CDATA[$result->numRows()]]></code>
-    </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Console.php">
     <DeprecatedMethod>
@@ -2998,7 +2995,6 @@
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[empty($GLOBALS['back'])]]></code>
       <code><![CDATA[empty($GLOBALS['goto'])]]></code>
-      <code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Controllers/Table/AddFieldController.php">
@@ -3219,7 +3215,6 @@
     </PossiblyInvalidIterator>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$message->isError()]]></code>
-      <code><![CDATA[empty($selected)]]></code>
     </RiskyTruthyFalsyComparison>
     <UnusedParam>
       <code><![CDATA[$request]]></code>
@@ -3896,11 +3891,6 @@
       <code><![CDATA[$_POST['field_expression'][$i]]]></code>
       <code><![CDATA[$_POST['field_virtuality'][$i]]]></code>
     </PossiblyInvalidOperand>
-    <RiskyTruthyFalsyComparison>
-      <code><![CDATA[$_POST['field_virtuality'][$i]]]></code>
-      <code><![CDATA[empty($_POST['field_adjust_privileges'][$i])]]></code>
-      <code><![CDATA[empty($_POST['field_move_to'][$i])]]></code>
-    </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Controllers/Table/StructureController.php">
     <DeprecatedMethod>
@@ -4221,7 +4211,6 @@
       <code><![CDATA[$array]]></code>
     </PossiblyUnusedParam>
     <RiskyTruthyFalsyComparison>
-      <code><![CDATA[! $size]]></code>
       <code><![CDATA[Config::getInstance()->get('is_setup')]]></code>
       <code><![CDATA[empty($_SERVER['REMOTE_ADDR'])]]></code>
     </RiskyTruthyFalsyComparison>
@@ -4557,7 +4546,6 @@
       <code><![CDATA[! empty($indexArray2[$f2])]]></code>
     </RedundantCondition>
     <RiskyTruthyFalsyComparison>
-      <code><![CDATA[! $value]]></code>
       <code><![CDATA[$foreigner]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
@@ -4712,6 +4700,8 @@
       <code><![CDATA[$routine['item_param_name'][$i]]]></code>
       <code><![CDATA[$routine['item_param_name'][$i]]]></code>
       <code><![CDATA[$routine['item_param_name'][$i]]]></code>
+      <code><![CDATA[$routine['item_param_name'][$i]]]></code>
+      <code><![CDATA[$routine['item_param_name'][$i]]]></code>
       <code><![CDATA[$routine['item_param_opts_text'][$i]]]></code>
       <code><![CDATA[$routine['item_param_type'][$i]]]></code>
       <code><![CDATA[$routine['item_param_type'][$i]]]></code>
@@ -4858,7 +4848,6 @@
     </PossiblyUndefinedArrayOffset>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[empty($_POST['editor_process_edit'])]]></code>
-      <code><![CDATA[empty($_POST['funcs'][$routine['item_param_name'][$i]])]]></code>
       <code><![CDATA[empty($_POST['item_adjust_privileges'])]]></code>
       <code><![CDATA[empty($_POST['item_comment'])]]></code>
       <code><![CDATA[empty($_POST['item_returnlength'])]]></code>
@@ -4935,8 +4924,6 @@
     </MixedArrayAssignment>
     <MixedArrayOffset>
       <code><![CDATA[$row[$keyIndex]]]></code>
-      <code><![CDATA[$row[$keyIndex]]]></code>
-      <code><![CDATA[$row[$keyIndex]]]></code>
     </MixedArrayOffset>
     <MixedAssignment>
       <code><![CDATA[$aLength]]></code>
@@ -6698,9 +6685,6 @@
     <PossiblyFalseOperand>
       <code><![CDATA[mb_strpos($tab, '_')]]></code>
     </PossiblyFalseOperand>
-    <RiskyTruthyFalsyComparison>
-      <code><![CDATA[empty($binaryLogs)]]></code>
-    </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Message.php">
     <MixedArgument>
@@ -6874,10 +6858,6 @@
     <PossiblyNullOperand>
       <code><![CDATA[$arr[0]]]></code>
     </PossiblyNullOperand>
-    <RiskyTruthyFalsyComparison>
-      <code><![CDATA[empty($this->config->selectedServer['only_db'])]]></code>
-      <code><![CDATA[empty($this->config->selectedServer['only_db'])]]></code>
-    </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Navigation/Nodes/NodeColumn.php">
     <MixedArgument>
@@ -9367,7 +9347,6 @@
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$foreigner]]></code>
       <code><![CDATA[$foreigner]]></code>
-      <code><![CDATA[empty($showComment)]]></code>
     </RiskyTruthyFalsyComparison>
     <UnusedProperty>
       <code><![CDATA[$bottomMargin]]></code>
@@ -10380,9 +10359,6 @@
     <DeprecatedMethod>
       <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
-    <RiskyTruthyFalsyComparison>
-      <code><![CDATA[empty($server['only_db'])]]></code>
-    </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Server/Status/Data.php">
     <MixedArgumentTypeCoercion>