From 4feeeb0c894b0f4e7d961e3a9d6fe0571b5e1d7a Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Wed, 22 Mar 2023 10:14:56 +0000
Subject: [PATCH] Add @psalm-return

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 libraries/classes/Util.php |  1 +
 psalm-baseline.xml         | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 0b1a16801245..0d4cb8e56bb8 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -704,6 +704,7 @@ private static function getConditionValue(
      * @psalm-param array<int, mixed> $row
      *
      * @return array the calculated condition and whether condition is unique
+     * @psalm-return array{string, bool, array}
      */
     public static function getUniqueCondition(
         int $fieldsCount,
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index f8409231aeb0..5dc7ec2069a7 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -4492,7 +4492,6 @@
       <code><![CDATA[$this->columnNullFlags[$column_index]]]></code>
       <code><![CDATA[$this->originalColumnTypes[$column_index]]]></code>
       <code>$type</code>
-      <code>$uniqueCondition</code>
     </MixedArgument>
     <MixedArgumentTypeCoercion>
       <code>$key</code>
@@ -4505,8 +4504,6 @@
       <code>$collation</code>
       <code>$columnName</code>
       <code>$is_unsigned</code>
-      <code><![CDATA[$row['where_clause']]]></code>
-      <code>$tmpData[$dataLabel]</code>
       <code>$type</code>
     </MixedAssignment>
     <PossiblyFalseArgument>
@@ -6340,8 +6337,6 @@
       <code>$clause</code>
       <code>$clause</code>
       <code>$clause</code>
-      <code>$clauseIsUnique</code>
-      <code>$clauseIsUnique</code>
       <code>$colOrder</code>
       <code>$colVisib</code>
       <code>$colVisib</code>
@@ -6373,8 +6368,6 @@
       <code>$sqlQuery</code>
       <code><![CDATA[$statementInfo->statement->from]]></code>
       <code><![CDATA[$urlParams['where_clause']]]></code>
-      <code>$whereClause</code>
-      <code>$whereClause</code>
       <code><![CDATA[$whereClauseMap[$rowNumber][$meta->orgtable]]]></code>
       <code><![CDATA[(int) $this->properties['unlim_num_rows'] / $_SESSION['tmpval']['max_rows']]]></code>
       <code><![CDATA[(int) $this->properties['unlim_num_rows'] / $_SESSION['tmpval']['max_rows']]]></code>
@@ -6571,12 +6564,9 @@
       <code>$sqlQueryAdd</code>
       <code>$tableCreateTime</code>
       <code>$value</code>
-      <code><![CDATA[$whereClauseMap[$rowNumber][$meta->orgtable]]]></code>
-      <code><![CDATA[$whereClauseMap[$rowNumber][$this->properties['table']]]]></code>
     </MixedAssignment>
     <MixedInferredReturnType>
       <code>Message</code>
-      <code>bool</code>
     </MixedInferredReturnType>
     <MixedMethodCall>
       <code>new $className()</code>
@@ -6603,9 +6593,6 @@
       <code><![CDATA[$statementInfo->statement->from[0]->table]]></code>
       <code><![CDATA[$statementInfo->statement->limit->offset]]></code>
     </MixedPropertyFetch>
-    <MixedReturnStatement>
-      <code>$clauseIsUnique</code>
-    </MixedReturnStatement>
     <MixedReturnTypeCoercion>
       <code>$map</code>
       <code><![CDATA[[
@@ -8193,7 +8180,6 @@
       <code><![CDATA[$mimeMap[$tableColumn['Field']]]]></code>
     </MixedArrayOffset>
     <MixedAssignment>
-      <code><![CDATA[$_SESSION['edit_next']]]></code>
       <code><![CDATA[$column['pma_type']]]></code>
       <code>$currCellEditedValues</code>
       <code><![CDATA[$currentRow[$column['Field']]]]></code>
@@ -9914,7 +9900,6 @@
       <code><![CDATA[$column['Type']]]></code>
       <code><![CDATA[$definition['Type']]]></code>
       <code><![CDATA[$statement->entityOptions->has('AUTO_INCREMENT')]]></code>
-      <code>$tmpUniqueCondition</code>
       <code><![CDATA[$trigger['drop']]]></code>
     </MixedOperand>
     <MixedPropertyTypeCoercion>