Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 797e137c5552 · 2025-01-30T15:48:08.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@mfauth.net&gt;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -6252,6 +6252,12 @@ parameters:
 			count: 1
 			path: src/Display/Results.php
 
+		-
+			message: '#^Binary operation "\+" between mixed and int\|numeric\-string results in an error\.$#'
+			identifier: binaryOp.invalid
+			count: 1
+			path: src/Display/Results.php
+
 		-
 			message: '#^Binary operation "\+" between mixed and mixed results in an error\.$#'
 			identifier: binaryOp.invalid
@@ -6321,7 +6327,7 @@ parameters:
 		-
 			message: '#^Cannot access offset ''max_rows'' on mixed\.$#'
 			identifier: offsetAccess.nonOffsetAccessible
-			count: 18
+			count: 19
 			path: src/Display/Results.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -4087,6 +4087,7 @@
       <code><![CDATA[$_SESSION['tmpval']['max_rows']]]></code>
       <code><![CDATA[$_SESSION['tmpval']['max_rows']]]></code>
       <code><![CDATA[$_SESSION['tmpval']['max_rows']]]></code>
+      <code><![CDATA[$_SESSION['tmpval']['max_rows']]]></code>
       <code><![CDATA[$_SESSION['tmpval']['pftext']]]></code>
       <code><![CDATA[$_SESSION['tmpval']['pftext']]]></code>
       <code><![CDATA[$_SESSION['tmpval']['pftext']]]></code>
diff --git a/src/Display/Results.php b/src/Display/Results.php
@@ -616,8 +616,9 @@ private function getTableNavigation(
 
         $isLastPage = $this->unlimNumRows !== -1 && $this->unlimNumRows !== false
             && ($isShowingAll
-                || (int) $_SESSION['tmpval']['pos'] + (int) $_SESSION['tmpval']['max_rows']
-                >= $this->unlimNumRows
+                || ($this->isExactCount()
+                    && (int) $_SESSION['tmpval']['pos'] + (int) $_SESSION['tmpval']['max_rows']
+                    >= $this->unlimNumRows)
                 || $this->numRows < $_SESSION['tmpval']['max_rows']);
 
         $onsubmit = ' onsubmit="return '
@@ -663,6 +664,15 @@ private function getTableNavigation(
         ];
     }
 
+    private function isExactCount(): bool
+    {
+        // If we have the full page of rows, we don't know
+        // if there are more unless unlimNumRows is smaller than MaxExactCount
+        return $this->unlimNumRows < $this->config->settings['MaxExactCount']
+            || $_SESSION['tmpval']['max_rows'] === self::ALL_ROWS
+            || $this->numRows < $_SESSION['tmpval']['max_rows'];
+    }
+
     /**
      * Get the headers of the results table, for all of the columns
      *
@@ -3383,7 +3393,7 @@ private function setMessageInformation(
             }
         } elseif ($_SESSION['tmpval']['max_rows'] === self::ALL_ROWS || $posNext > $total) {
             $firstShownRec = $_SESSION['tmpval']['pos'];
-            $lastShownRec = $total - 1;
+            $lastShownRec = $firstShownRec + $this->numRows - 1;
         } else {
             $firstShownRec = $_SESSION['tmpval']['pos'];
             $lastShownRec = $posNext - 1;

Original file line number	Diff line number	Diff line change
`@@ -6252,6 +6252,12 @@ parameters:`
`6252`	`6252`	`count: 1`
`6253`	`6253`	`path: src/Display/Results.php`
`6254`	`6254`
	`6255`	`+ -`
	`6256`	`+ message: '#^Binary operation "\+" between mixed and int\\|numeric\-string results in an error\.$#'`
	`6257`	`+ identifier: binaryOp.invalid`
	`6258`	`+ count: 1`
	`6259`	`+ path: src/Display/Results.php`
	`6260`	`+`
`6255`	`6261`	`-`
`6256`	`6262`	`message: '#^Binary operation "\+" between mixed and mixed results in an error\.$#'`
`6257`	`6263`	`identifier: binaryOp.invalid`
`@@ -6321,7 +6327,7 @@ parameters:`
`6321`	`6327`	`-`
`6322`	`6328`	`message: '#^Cannot access offset ''max_rows'' on mixed\.$#'`
`6323`	`6329`	`identifier: offsetAccess.nonOffsetAccessible`
`6324`		`- count: 18`
	`6330`	`+ count: 19`
`6325`	`6331`	`path: src/Display/Results.php`
`6326`	`6332`
`6327`	`6333`	`-`