wip

src/Http/Requests/GetAllMethodsRequest.php

@@ -20,9 +20,9 @@ class GetAllMethodsRequest extends ResourceHydratableRequest
 
     private GetAllMethodsQuery $query;
 
-    public function __construct(GetAllMethodsQuery $query)
+    public function __construct(?GetAllMethodsQuery $query = null)
     {
-        $this->query = $query;
+        $this->query = $query ?: new GetAllMethodsQuery();
     }
 
     protected function defaultQuery(): array

src/Http/Requests/GetClientRequest.php

@@ -20,17 +20,17 @@ class GetClientRequest extends ResourceHydratableRequest
 
     private string $id;
 
-    private GetClientQuery $query;
+    private ?GetClientQuery $query;
 
-    public function __construct(string $id, GetClientQuery $query)
+    public function __construct(string $id, ?GetClientQuery $query = null)
     {
         $this->id = $id;
         $this->query = $query;
     }
 
     protected function defaultQuery(): array
     {
-        return $this->query->toArray();
+        return $this->query ? $this->query->toArray() : [];
     }
 
     public function resolveResourcePath(): string

src/Http/Requests/GetEnabledMethodsRequest.php

@@ -13,16 +13,16 @@ class GetEnabledMethodsRequest extends ResourceHydratableRequest implements Supp
 
     public static string $targetResourceClass = MethodCollection::class;
 
-    private GetEnabledPaymentMethodsQuery $query;
+    private ?GetEnabledPaymentMethodsQuery $query = null;
 
-    public function __construct(GetEnabledPaymentMethodsQuery $query)
+    public function __construct(?GetEnabledPaymentMethodsQuery $query = null)
     {
         $this->query = $query;
     }
 
     protected function defaultQuery(): array
     {
-        return $this->query->toArray();
+        return $this->query ? $this->query->toArray() : [];
     }
 
     public function resolveResourcePath(): string

src/Http/Requests/GetPaginatedBalanceTransactionRequest.php

@@ -20,7 +20,7 @@ class GetPaginatedBalanceTransactionRequest extends PaginatedRequest implements
 
     public function __construct(
         string $balanceId,
-        PaginatedQuery $query
+        ?PaginatedQuery $query = null
     ) {
         parent::__construct($query);
 

src/Http/Requests/GetPaginatedCustomerPaymentsRequest.php

@@ -21,7 +21,7 @@ class GetPaginatedCustomerPaymentsRequest extends PaginatedRequest implements Is
 
     public function __construct(
         string $customerId,
-        GetPaginatedCustomerPaymentsQuery $query
+        ?GetPaginatedCustomerPaymentsQuery $query = null
     ) {
         parent::__construct($query);
 

src/Http/Requests/GetPaginatedMandateRequest.php

@@ -19,7 +19,7 @@ class GetPaginatedMandateRequest extends PaginatedRequest implements IsIteratabl
 
     private string $customerId;
 
-    public function __construct(string $customerId, PaginatedQuery $query)
+    public function __construct(string $customerId, ?PaginatedQuery $query = null)
     {
         parent::__construct($query);
 

src/Http/Requests/GetPaginatedSubscriptionPaymentsRequest.php

@@ -21,7 +21,7 @@ class GetPaginatedSubscriptionPaymentsRequest extends PaginatedRequest implement
 
     private string $subscriptionId;
 
-    public function __construct(string $customerId, string $subscriptionId, PaginatedQuery $query)
+    public function __construct(string $customerId, string $subscriptionId, ?PaginatedQuery $query = null)
     {
         $this->customerId = $customerId;
         $this->subscriptionId = $subscriptionId;

src/Http/Requests/GetPaginatedSubscriptionsRequest.php

@@ -19,7 +19,7 @@ class GetPaginatedSubscriptionsRequest extends PaginatedRequest implements IsIte
 
     private string $customerId;
 
-    public function __construct(string $customerId, PaginatedQuery $query)
+    public function __construct(string $customerId, ?PaginatedQuery $query = null)
     {
         $this->customerId = $customerId;
 

src/Http/Requests/GetPaymentMethodRequest.php

@@ -13,19 +13,19 @@ class GetPaymentMethodRequest extends ResourceHydratableRequest implements Suppo
 
     public static string $targetResourceClass = Method::class;
 
-    private GetPaymentMethodQuery $query;
+    private ?GetPaymentMethodQuery $query = null;
 
     private string $methodId;
 
-    public function __construct(string $methodId, GetPaymentMethodQuery $query)
+    public function __construct(string $methodId, ?GetPaymentMethodQuery $query = null)
     {
         $this->methodId = $methodId;
         $this->query = $query;
     }
 
     protected function defaultQuery(): array
     {
-        return $this->query->toArray();
+        return $this->query ? $this->query->toArray() : [];
     }
 
     public function resolveResourcePath(): string

src/Http/Requests/GetPaymentRefundRequest.php

@@ -23,9 +23,9 @@ class GetPaymentRefundRequest extends ResourceHydratableRequest implements Suppo
 
     private string $refundId;
 
-    private GetPaymentRefundQuery $query;
+    private ?GetPaymentRefundQuery $query = null;
 
-    public function __construct(string $paymentId, string $refundId, GetPaymentRefundQuery $query)
+    public function __construct(string $paymentId, string $refundId, ?GetPaymentRefundQuery $query = null)
     {
         $this->paymentId = $paymentId;
         $this->refundId = $refundId;
@@ -34,7 +34,7 @@ public function __construct(string $paymentId, string $refundId, GetPaymentRefun
 
     protected function defaultQuery(): array
     {
-        return $this->query->toArray();
+        return $this->query ? $this->query->toArray() : [];
     }
 
     /**

src/Http/Requests/GetPaymentRequest.php

@@ -21,19 +21,19 @@ class GetPaymentRequest extends ResourceHydratableRequest implements SupportsTes
 
     private string $id;
 
-    private GetPaymentQuery $query;
+    private ?GetPaymentQuery $query = null;
 
     public function __construct(
         string $id,
-        GetPaymentQuery $query
+        ?GetPaymentQuery $query = null
     ) {
         $this->id = $id;
         $this->query = $query;
     }
 
     protected function defaultQuery(): array
     {
-        return $this->query->toArray();
+        return $this->query ? $this->query->toArray() : [];
     }
 
     /**

src/Http/Response.php

@@ -5,6 +5,9 @@
 use Mollie\Api\Contracts\Connector;
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Http\Requests\ResourceHydratableRequest;
+use Mollie\Api\Resources\BaseResource;
+use Mollie\Api\Resources\ResourceCollection;
+use Mollie\Api\Traits\DelegatesToResource;
 use Mollie\Api\Traits\HandlesResourceHydration;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -14,6 +17,7 @@
 
 class Response
 {
+    use DelegatesToResource;
     use HandlesResourceHydration;
 
     protected ResponseInterface $psrResponse;
@@ -24,6 +28,11 @@ class Response
 
     protected ?Throwable $senderException = null;
 
+    /**
+     * @var null|BaseResource|ResourceCollection
+     */
+    protected $resource = null;
+
     /**
      * The decoded JSON response.
      */
@@ -42,15 +51,15 @@ public function __construct(
     }
 
     /**
-     * @return mixed
+     * @return self|BaseResource|ResourceCollection|null
      */
     public function toResource()
     {
         if (! $this->getRequest() instanceof ResourceHydratableRequest) {
             return $this;
         }
 
-        return $this->hydrate($this->getRequest(), $this);
+        return $this->resource ?: $this->resource = $this->hydrate($this->getRequest(), $this);
     }
 
     /**

src/Resources/CursorCollection.php

@@ -4,43 +4,17 @@
 
 use Generator;
 use Mollie\Api\Http\Requests\DynamicGetRequest;
-use Mollie\Api\Http\Requests\ResourceHydratableRequest;
+use Mollie\Api\Http\Response;
 
 abstract class CursorCollection extends ResourceCollection
 {
-    private bool $autoHydrate = false;
-
-    public function setAutoHydrate(bool $shouldAutoHydrate = true): void
-    {
-        $this->autoHydrate = $shouldAutoHydrate;
-    }
-
-    public function shouldAutoHydrate(): bool
-    {
-        if ($this->response === null) {
-            return $this->autoHydrate;
-        }
-
-        $request = $this->response->getRequest();
-
-        /**
-         * Don't try to hydrate when the request
-         * already has auto-hydration enabled. The
-         * Hydrate Middleware will take care of that.
-         */
-        if ($request instanceof ResourceHydratableRequest && $request->shouldAutoHydrate()) {
-            return false;
-        }
-
-        return $this->autoHydrate;
-    }
-
     /**
      * Return the next set of resources when available
      *
+     * @return null|CursorCollection|Response
      * @throws \Mollie\Api\Exceptions\ApiException
      */
-    public function next(): ?CursorCollection
+    public function next()
     {
         if (! $this->hasNext()) {
             return null;
@@ -52,9 +26,10 @@ public function next(): ?CursorCollection
     /**
      * Return the previous set of resources when available
      *
+     * @return null|CursorCollection|Response
      * @throws \Mollie\Api\Exceptions\ApiException
      */
-    public function previous(): ?CursorCollection
+    public function previous()
     {
         if (! $this->hasPrevious()) {
             return null;
@@ -63,15 +38,14 @@ public function previous(): ?CursorCollection
         return $this->fetchCollection($this->_links->previous->href);
     }
 
-    private function fetchCollection(string $url): CursorCollection
+    /**
+     * @return CursorCollection|Response
+     */
+    private function fetchCollection(string $url)
     {
-        $response = $this
+        return $this
             ->connector
             ->send(new DynamicGetRequest($url, static::class));
-
-        return $this->shouldAutoHydrate()
-            ? $response->toResource()
-            : $response;
     }
 
     /**
@@ -99,8 +73,6 @@ public function getAutoIterator(bool $iterateBackwards = false): LazyCollection
 
         return new LazyCollection(function () use ($page, $iterateBackwards): Generator {
             while (true) {
-                $page->setAutoHydrate();
-
                 foreach ($page as $item) {
                     yield $item;
                 }
@@ -109,9 +81,13 @@ public function getAutoIterator(bool $iterateBackwards = false): LazyCollection
                     break;
                 }
 
-                $page = $iterateBackwards
+                $response = $iterateBackwards
                     ? $page->previous()
                     : $page->next();
+
+                $page = $response instanceof Response
+                    ? $response->toResource()
+                    : $response;
             }
         });
     }