Skip to content

Fix PaginatedResponse #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2022
Merged

Fix PaginatedResponse #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Summarize Search option enabled by default (without possibility to disable it) ([Issue#26])
- Highlight Search option enabled by default (without possibility to disable it) ([Issue#26])
- Fix error when parsing response from Search with NOCONTENT flag
- Make PaginatedResponse `valid` iterator function work

## [2.1.0]

Expand Down
13 changes: 9 additions & 4 deletions src/Redis/Response/PaginatedResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,19 @@ public function key()
return 0;
}

return (int) floor(($this->lastCommand->getOffset() ?? 0) / $this->getPageSize());
return (int) floor(($this->lastCommand->getOffset() ?? $this->requestedOffset ?? 0) / $this->getPageSize());
}

public function valid()
{
return $this->requestedOffset >= 0
&& $this->requestedSize > 0
&& $this->requestedOffset < $this->totalCount;
return (
null === $this->requestedOffset
&& null === $this->requestedSize
) || (
$this->requestedOffset >= 0
&& $this->requestedSize > 0
&& $this->requestedOffset < $this->totalCount
);
}

public function rewind(): void
Expand Down