From 4e0d81926e3261a0a1bf43c441678a28eb19a4b1 Mon Sep 17 00:00:00 2001
From: Sergei Predvoditelev <sergei@predvoditelev.ru>
Date: Tue, 29 Jul 2025 23:10:09 +0300
Subject: [PATCH] fix tests

---
 tests/Paginator/KeysetPaginatorTest.php |  8 +++++---
 tests/Paginator/OffsetPaginatorTest.php | 16 ++++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/tests/Paginator/KeysetPaginatorTest.php b/tests/Paginator/KeysetPaginatorTest.php
index 8245b0d..2e292e8 100644
--- a/tests/Paginator/KeysetPaginatorTest.php
+++ b/tests/Paginator/KeysetPaginatorTest.php
@@ -1238,13 +1238,15 @@ public function testPreviousPageIterativeReading(): void
         $paginator = (new KeysetPaginator($dataReader))->withPageSize(2)->withToken(PageToken::next('2'));
 
         $allData = [];
-        $currentPaginator = $paginator;
 
         // Read all pages iteratively
-        while ($currentPaginator !== null) {
+        for (
+            $currentPaginator = $paginator;
+            $currentPaginator !== null;
+            $currentPaginator = $currentPaginator->previousPage()
+        ) {
             $pageData = array_values($this->iterableToArray($currentPaginator->read()));
             $allData = array_merge($pageData, $allData);
-            $currentPaginator = $currentPaginator->previousPage();
         }
 
         // Verify we got all the data
diff --git a/tests/Paginator/OffsetPaginatorTest.php b/tests/Paginator/OffsetPaginatorTest.php
index 439819c..5ecdad8 100644
--- a/tests/Paginator/OffsetPaginatorTest.php
+++ b/tests/Paginator/OffsetPaginatorTest.php
@@ -698,13 +698,15 @@ public function testNextPageIterativeReading(): void
         $paginator = (new OffsetPaginator($dataReader))->withPageSize(2);
 
         $allData = [];
-        $currentPaginator = $paginator;
 
         // Read all pages iteratively
-        while ($currentPaginator !== null) {
+        for (
+            $currentPaginator = $paginator;
+            $currentPaginator !== null;
+            $currentPaginator = $currentPaginator->nextPage()
+        ) {
             $pageData = array_values($this->iterableToArray($currentPaginator->read()));
             $allData = array_merge($allData, $pageData);
-            $currentPaginator = $currentPaginator->nextPage();
         }
 
         // Verify we got all the data
@@ -738,13 +740,15 @@ public function testPreviousPageIterativeReading(): void
         $paginator = (new OffsetPaginator($dataReader))->withPageSize(2)->withCurrentPage(2);
 
         $allData = [];
-        $currentPaginator = $paginator;
 
         // Read all pages iteratively
-        while ($currentPaginator !== null) {
+        for (
+            $currentPaginator = $paginator;
+            $currentPaginator !== null;
+            $currentPaginator = $currentPaginator->previousPage()
+        ) {
             $pageData = array_values($this->iterableToArray($currentPaginator->read()));
             $allData = array_merge($pageData, $allData);
-            $currentPaginator = $currentPaginator->previousPage();
         }
 
         // Verify we got all the data