Bugfix

Author: timvandijck

src/FloatClient.php

@@ -46,12 +46,12 @@ public function paginate(Request $request): Paginator
         {
             protected function isLastPage(Response $response): bool
             {
-                return is_null($response->json('next_page_url'));
+                return $response->header('X-Pagination-Page-Count') === $response->header('X-Pagination-Current-Page');
             }
 
             protected function getPageItems(Response $response, Request $request): array
             {
-                return $response->json('items');
+                return $response->json();
             }
 
             protected function applyPagination(Request $request): Request

src/Groups/ProjectsGroup.php

@@ -3,11 +3,13 @@
 namespace Spatie\FloatSdk\Groups;
 
 use Generator;
-use Saloon\Http\BaseResource;
 use Saloon\Http\Response;
-use Spatie\FloatSdk\QueryParameters\GetProjectsParams;
+use Saloon\Http\BaseResource;
+use Saloon\PaginationPlugin\Paginator;
 use Spatie\FloatSdk\Requests\GetProject;
 use Spatie\FloatSdk\Requests\GetProjects;
+use Saloon\PaginationPlugin\Contracts\Paginatable;
+use Spatie\FloatSdk\QueryParameters\GetProjectsParams;
 
 class ProjectsGroup extends BaseResource
 {
@@ -16,12 +18,8 @@ public function get(int $projectId): Response
         return $this->connector->send(new GetProject($projectId));
     }
 
-    public function all(?GetProjectsParams $parameters = null): Generator
+    public function all(?GetProjectsParams $parameters = null): Paginator
     {
-        $paginator = $this->connector->paginate(new GetProjects($parameters));
-
-        foreach ($paginator->paginate() as $response) {
-            yield $response;
-        }
+        return $this->connector->paginate(new GetProjects($parameters));
     }
 }

src/Requests/GetAllocations.php

@@ -7,6 +7,7 @@
 use Saloon\Http\Response;
 use Saloon\PaginationPlugin\Contracts\Paginatable;
 use Spatie\FloatSdk\QueryParameters\GetAllocationsParams;
+use Spatie\FloatSdk\Resources\AllocationResource;
 use Spatie\FloatSdk\Resources\ProjectTaskResource;
 
 class GetAllocations extends Request implements Paginatable
@@ -31,7 +32,7 @@ public function resolveEndpoint(): string
     public function createDtoFromResponse(Response $response): array
     {
         return array_map(
-            fn (array $object) => ProjectTaskResource::createFromResponse($object),
+            fn (array $object) => AllocationResource::createFromResponse($object),
             $response->json()
         );
     }

src/Resources/ProjectTaskResource.php

@@ -13,6 +13,7 @@ public function __construct(
     /** @param array<string, mixed> $response */
     public static function createFromResponse(array $response): self
     {
+        ray('createFromResponse', $response);
         return new self(
             id: $response['task_meta_id'],
             name: $response['task_name'],