From 5ee6ccec57502a73bc98c989d3b435a528f4b5cc Mon Sep 17 00:00:00 2001 From: Craig Potter Date: Sat, 21 Oct 2023 19:44:21 +0100 Subject: [PATCH 1/2] Fix pagination issue --- src/Fca.php | 3 ++- src/Requests/GetEndpoint.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Fca.php b/src/Fca.php index 5bf8d62..ac6670d 100644 --- a/src/Fca.php +++ b/src/Fca.php @@ -113,7 +113,8 @@ protected function isLastPage(Response $response): bool */ protected function getPageItems(Response $response, Request $request): array { - return $request->createDtoFromResponse($response); + $items = $request->createDtoFromResponse($response); + return $items ?? $response->json('Data', []); } /** diff --git a/src/Requests/GetEndpoint.php b/src/Requests/GetEndpoint.php index 1822d87..669c19b 100644 --- a/src/Requests/GetEndpoint.php +++ b/src/Requests/GetEndpoint.php @@ -6,8 +6,9 @@ use Saloon\Enums\Method; use Saloon\Http\Request; +use Saloon\PaginationPlugin\Contracts\Paginatable; -class GetEndpoint extends Request +class GetEndpoint extends Request implements Paginatable { /** * The HTTP method of the request. From 94c68e89079abc52ff0bc74a93e2f0bdca6ff27b Mon Sep 17 00:00:00 2001 From: craigpotter Date: Sat, 21 Oct 2023 18:48:17 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=AA=84=20Code=20Style=20Fixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Fca.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Fca.php b/src/Fca.php index ac6670d..bddcd3d 100644 --- a/src/Fca.php +++ b/src/Fca.php @@ -114,6 +114,7 @@ protected function isLastPage(Response $response): bool protected function getPageItems(Response $response, Request $request): array { $items = $request->createDtoFromResponse($response); + return $items ?? $response->json('Data', []); }