Skip to content

Commit 07e9146

Browse files
authored
fix tests (#230)
1 parent b2cf097 commit 07e9146

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

tests/Paginator/KeysetPaginatorTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,13 +1238,15 @@ public function testPreviousPageIterativeReading(): void
12381238
$paginator = (new KeysetPaginator($dataReader))->withPageSize(2)->withToken(PageToken::next('2'));
12391239

12401240
$allData = [];
1241-
$currentPaginator = $paginator;
12421241

12431242
// Read all pages iteratively
1244-
while ($currentPaginator !== null) {
1243+
for (
1244+
$currentPaginator = $paginator;
1245+
$currentPaginator !== null;
1246+
$currentPaginator = $currentPaginator->previousPage()
1247+
) {
12451248
$pageData = array_values($this->iterableToArray($currentPaginator->read()));
12461249
$allData = array_merge($pageData, $allData);
1247-
$currentPaginator = $currentPaginator->previousPage();
12481250
}
12491251

12501252
// Verify we got all the data

tests/Paginator/OffsetPaginatorTest.php

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -698,13 +698,15 @@ public function testNextPageIterativeReading(): void
698698
$paginator = (new OffsetPaginator($dataReader))->withPageSize(2);
699699

700700
$allData = [];
701-
$currentPaginator = $paginator;
702701

703702
// Read all pages iteratively
704-
while ($currentPaginator !== null) {
703+
for (
704+
$currentPaginator = $paginator;
705+
$currentPaginator !== null;
706+
$currentPaginator = $currentPaginator->nextPage()
707+
) {
705708
$pageData = array_values($this->iterableToArray($currentPaginator->read()));
706709
$allData = array_merge($allData, $pageData);
707-
$currentPaginator = $currentPaginator->nextPage();
708710
}
709711

710712
// Verify we got all the data
@@ -738,13 +740,15 @@ public function testPreviousPageIterativeReading(): void
738740
$paginator = (new OffsetPaginator($dataReader))->withPageSize(2)->withCurrentPage(2);
739741

740742
$allData = [];
741-
$currentPaginator = $paginator;
742743

743744
// Read all pages iteratively
744-
while ($currentPaginator !== null) {
745+
for (
746+
$currentPaginator = $paginator;
747+
$currentPaginator !== null;
748+
$currentPaginator = $currentPaginator->previousPage()
749+
) {
745750
$pageData = array_values($this->iterableToArray($currentPaginator->read()));
746751
$allData = array_merge($pageData, $allData);
747-
$currentPaginator = $currentPaginator->previousPage();
748752
}
749753

750754
// Verify we got all the data

0 commit comments

Comments
 (0)