Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions tests/Paginator/KeysetPaginatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 10 additions & 6 deletions tests/Paginator/OffsetPaginatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down