Merge branch 'QA_5_2'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Feb 7, 2022 · bc58521 · bc58521
2 parents b5096a4 + b59d46b
commit bc58521
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
@@ -124,7 +124,7 @@ class Results
      *   table: string,
      *   goto: string,
      *   sql_query: string,
-     *   unlim_num_rows: int|numeric-string,
+     *   unlim_num_rows: int|numeric-string|false,
      *   fields_meta: FieldMetadata[],
      *   is_count: bool|null,
      *   is_export: bool|null,
@@ -726,7 +726,7 @@ private function getHtmlPageSelector(): array
     {
         $pageNow = (int) floor($_SESSION['tmpval']['pos'] / $_SESSION['tmpval']['max_rows']) + 1;
 
-        $nbTotalPage = (int) ceil($this->properties['unlim_num_rows'] / $_SESSION['tmpval']['max_rows']);
+        $nbTotalPage = (int) ceil((int) $this->properties['unlim_num_rows'] / $_SESSION['tmpval']['max_rows']);
 
         $output = '';
         if ($nbTotalPage > 1) {
@@ -796,7 +796,8 @@ private function getTableNavigation(
         // Move to the next page or to the last one
         $moveForwardButtons = '';
         if (
-            $this->properties['unlim_num_rows'] === false // view with unknown number of rows
+            // view with unknown number of rows
+            ($this->properties['unlim_num_rows'] === -1 || $this->properties['unlim_num_rows'] === false)
             || (! $isShowingAll
             && intval($_SESSION['tmpval']['pos']) + intval($_SESSION['tmpval']['max_rows'])
                 < $this->properties['unlim_num_rows']
@@ -909,7 +910,7 @@ private function getMoveForwardButtonsForTableNavigation(
             '&gt;&gt;',
             _pgettext('Last page', 'End'),
             @((int) ceil(
-                $this->properties['unlim_num_rows']
+                (int) $this->properties['unlim_num_rows']
                 / $_SESSION['tmpval']['max_rows']
             ) - 1) * $maxRows,
             $htmlSqlQuery,
@@ -4095,7 +4096,7 @@ private function getBulkLinks(
      *     sql_query: string,
      *     single_table?: "true",
      *     raw_query?: "true",
-     *     unlim_num_rows?: int|numeric-string
+     *     unlim_num_rows?: int|numeric-string|false
      *   }
      * }
      */

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -5726,12 +5726,12 @@
       <code>$sortExpressionNoDirection[$indexInExpression]</code>
       <code>$sortExpressionNoDirection[$indexInExpression]</code>
       <code>$sqlQuery</code>
-      <code>$this-&gt;properties['unlim_num_rows'] / $_SESSION['tmpval']['max_rows']</code>
       <code>$total</code>
       <code>$urlParams['where_clause']</code>
       <code>$whereClause</code>
       <code>$whereClause</code>
       <code>$whereClauseMap[$rowNumber][$meta-&gt;orgtable]</code>
+      <code>(int) $this-&gt;properties['unlim_num_rows'] / $_SESSION['tmpval']['max_rows']</code>
       <code>empty($field-&gt;database) ? $this-&gt;properties['db'] : $field-&gt;database</code>
     </MixedArgument>
     <MixedArgumentTypeCoercion occurrences="6">