Remove unusued parameter $columnIndex

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
phpmyadmin · Dec 1, 2021 · eb97aa9 · eb97aa9
1 parent 5d645a1
commit eb97aa9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
@@ -1061,7 +1061,6 @@ private function getTableHeadersForColumns(
                     $fieldsMeta[$i],
                     $sortExpression,
                     $sortExpressionNoDirection,
-                    $i,
                     $unsortedSqlQuery,
                     $sessionMaxRows,
                     $comments,
@@ -1575,7 +1574,6 @@ private function getCommentForRow(array $commentsMap, FieldMetadata $fieldsMeta)
      * @param FieldMetadata $fieldsMeta                set of field properties
      * @param array         $sortExpression            sort expression
      * @param array         $sortExpressionNoDirection sort expression without direction
-     * @param int           $columnIndex               the index of the column
      * @param string        $unsortedSqlQuery          the unsorted sql query
      * @param int           $sessionMaxRows            maximum rows resulted by sql
      * @param string        $comments                  comment for row
@@ -1591,7 +1589,6 @@ private function getOrderLinkAndSortedHeaderHtml(
         FieldMetadata $fieldsMeta,
         array $sortExpression,
         array $sortExpressionNoDirection,
-        $columnIndex,
         $unsortedSqlQuery,
         $sessionMaxRows,
         $comments,

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -5979,7 +5979,7 @@
     <InvalidScalarArgument occurrences="1">
       <code>$originalLength</code>
     </InvalidScalarArgument>
-    <MixedArgument occurrences="89">
+    <MixedArgument occurrences="88">
       <code>$_SESSION['tmpval']['max_rows']</code>
       <code>$_SESSION['tmpval']['pos'] / $_SESSION['tmpval']['max_rows']</code>
       <code>$_SESSION['tmpval']['query']</code>
@@ -6019,7 +6019,6 @@
       <code>$expr-&gt;alias</code>
       <code>$field-&gt;table</code>
       <code>$geometryText</code>
-      <code>$i</code>
       <code>$isFieldTruncated</code>
       <code>$isFieldTruncated</code>
       <code>$isFieldTruncated</code>
@@ -6398,9 +6397,6 @@
     <TypeDoesNotContainType occurrences="1">
       <code>is_array($map)</code>
     </TypeDoesNotContainType>
-    <UnusedParam occurrences="1">
-      <code>$columnIndex</code>
-    </UnusedParam>
     <UnusedVariable occurrences="1">
       <code>$key</code>
     </UnusedVariable>