remove hydration setting and always hydrate

.github/ISSUE_TEMPLATE.md

@@ -1,8 +1,8 @@
 ## Specifications
 
-  - API Version: 
+  - API Version:
+  - SDK Version:
 
 ## Describe the issue
 
 ...
-

composer.json

@@ -60,6 +60,7 @@
     "brianium/paratest": "^6.11",
     "friendsofphp/php-cs-fixer": "^3.39",
     "guzzlehttp/guzzle": "^7.6",
+    "laravel/pint": "^1.18",
     "phpstan/phpstan": "^2.0",
     "phpunit/phpunit": "^9.6"
   },

src/Contracts/Connector.php

@@ -5,7 +5,7 @@
 use Mollie\Api\Http\Middleware;
 use Mollie\Api\Http\Request;
 
-interface Connector extends Authenticatable, Hydratable, IdempotencyContract, SupportsDebuggingContract, Testable
+interface Connector extends Authenticatable, IdempotencyContract, SupportsDebuggingContract, Testable
 {
     public function send(Request $request): ?object;
 

src/Contracts/HasResponse.php

@@ -6,5 +6,5 @@
 
 interface HasResponse extends ViableResponse
 {
-    public function getResponse(): ?Response;
+    public function getResponse(): Response;
 }

src/Contracts/PayloadRepository.php

@@ -21,6 +21,10 @@ public function remove(string $key): self;
 
     public function add(string $key, $value): self;
 
+    public function get(string $key, $default = null): mixed;
+
+    public function merge(array ...$arrays): self;
+
     public function isEmpty(): bool;
 
     public function isNotEmpty(): bool;

src/Contracts/RequestMiddleware.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Mollie\Api\Contracts;
+
+use Mollie\Api\Http\PendingRequest;
+
+interface RequestMiddleware
+{
+    /**
+     * @return PendingRequest|void
+     */
+    public function __invoke(PendingRequest $pendingRequest);
+}

src/Contracts/ResponseMiddleware.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Mollie\Api\Contracts;
+
+use Mollie\Api\Http\Response;
+use Mollie\Api\Http\ViableResponse;
+
+interface ResponseMiddleware
+{
+    /**
+     * @return Response|ViableResponse|mixed|void
+     */
+    public function __invoke(Response $response);
+}

src/EndpointCollection/EndpointCollection.php

@@ -12,11 +12,6 @@ abstract class EndpointCollection
     public function __construct(Connector $connector)
     {
         $this->connector = $connector;
-
-        /**
-         * Default hydration decision to true to maintain legacy compatibility.
-         */
-        $connector::setAutoHydrate();
     }
 
     /**

src/EndpointCollection/ProfileEndpointCollection.php

@@ -66,10 +66,14 @@ public function get(string $profileId, $testmode = []): Profile
      */
     public function getCurrent($testmode = []): CurrentProfile
     {
-        GetProfileRequest::$targetResourceClass = CurrentProfile::class;
+        $testmode = Utility::extractBool($testmode, 'testmode', false);
 
         /** @var CurrentProfile */
-        return $this->get('me', $testmode);
+        return $this->send(
+            (new GetProfileRequest('me'))
+                ->setHydratableResource(CurrentProfile::class)
+                ->test($testmode)
+        );
     }
 
     /**

src/Http/Middleware/ApplyIdempotencyKey.php

@@ -2,10 +2,11 @@
 
 namespace Mollie\Api\Http\Middleware;
 
+use Mollie\Api\Contracts\RequestMiddleware;
 use Mollie\Api\Http\PendingRequest;
 use Mollie\Api\Types\Method;
 
-class ApplyIdempotencyKey
+class ApplyIdempotencyKey implements RequestMiddleware
 {
     const IDEMPOTENCY_KEY_HEADER = 'Idempotency-Key';
 

src/Http/Middleware/GuardResponse.php

@@ -2,13 +2,14 @@
 
 namespace Mollie\Api\Http\Middleware;
 
+use Mollie\Api\Contracts\ResponseMiddleware;
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Http\Response;
 use Mollie\Api\Http\ResponseStatusCode;
 
-class GuardResponse
+class GuardResponse implements ResponseMiddleware
 {
-    public function __invoke(Response $response)
+    public function __invoke(Response $response): void
     {
         if (($isEmpty = $response->isEmpty()) && $response->status() !== ResponseStatusCode::HTTP_NO_CONTENT) {
             throw new ApiException('No response body found.');

src/Http/Middleware/ResetIdempotencyKey.php

@@ -2,9 +2,10 @@
 
 namespace Mollie\Api\Http\Middleware;
 
+use Mollie\Api\Contracts\ResponseMiddleware;
 use Mollie\Api\Http\Response;
 
-class ResetIdempotencyKey
+class ResetIdempotencyKey implements ResponseMiddleware
 {
     public function __invoke(Response $response): void
     {

src/Http/Middleware/ThrowExceptionIfRequestFailed.php

@@ -2,12 +2,13 @@
 
 namespace Mollie\Api\Http\Middleware;
 
+use Mollie\Api\Contracts\ResponseMiddleware;
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Http\Response;
 
-class ThrowExceptionIfRequestFailed
+class ThrowExceptionIfRequestFailed implements ResponseMiddleware
 {
-    public function __invoke(Response $response)
+    public function __invoke(Response $response): void
     {
         if ($response->successful()) {
             return;

src/Http/PendingRequest.php

@@ -8,9 +8,7 @@
 use Mollie\Api\Contracts\SupportsTestmodeInPayload;
 use Mollie\Api\Contracts\SupportsTestmodeInQuery;
 use Mollie\Api\Http\Middleware\ApplyIdempotencyKey;
-use Mollie\Api\Http\Middleware\EvaluateHydrationSetting;
 use Mollie\Api\Http\Middleware\GuardResponse;
-use Mollie\Api\Http\Middleware\Hydrate;
 use Mollie\Api\Http\Middleware\MiddlewarePriority;
 use Mollie\Api\Http\Middleware\ResetIdempotencyKey;
 use Mollie\Api\Http\Middleware\ThrowExceptionIfRequestFailed;
@@ -68,14 +66,12 @@ public function __construct(Connector $connector, Request $request)
             ->middleware()
 
             /** On request */
-            ->onRequest(new EvaluateHydrationSetting, 'hydration')
             ->onRequest(new ApplyIdempotencyKey, 'idempotency')
 
             /** On response */
             ->onResponse(new ResetIdempotencyKey, 'idempotency')
             ->onResponse(new GuardResponse, MiddlewarePriority::HIGH)
-            ->onResponse(new ThrowExceptionIfRequestFailed, MiddlewarePriority::HIGH)
-            ->onResponse(new Hydrate, 'hydration', MiddlewarePriority::LOW);
+            ->onResponse(new ThrowExceptionIfRequestFailed, MiddlewarePriority::HIGH);
     }
 
     public function setTestmode(bool $testmode): self
@@ -89,6 +85,17 @@ public function setTestmode(bool $testmode): self
         return $this;
     }
 
+    public function getTestmode(): bool
+    {
+        if (! $this->request instanceof SupportsTestmodeInQuery && ! $this->request instanceof SupportsTestmodeInPayload) {
+            return false;
+        }
+
+        return $this->request instanceof SupportsTestmodeInQuery
+            ? $this->query()->get('testmode', false)
+            : $this->payload()->get('testmode', false);
+    }
+
     public function setPayload(PayloadRepository $bodyRepository): self
     {
         $this->payload = $bodyRepository;

src/Http/Requests/ApplePayPaymentSessionRequest.php

@@ -14,7 +14,7 @@ class ApplePayPaymentSessionRequest extends ResourceHydratableRequest implements
 
     protected static string $method = Method::POST;
 
-    public static string $targetResourceClass = AnyResource::class;
+    protected $hydratableResource = AnyResource::class;
 
     private RequestApplePayPaymentSessionPayload $payload;
 

src/Http/Requests/CancelPaymentRequest.php

@@ -10,7 +10,7 @@ class CancelPaymentRequest extends ResourceHydratableRequest implements Supports
 {
     protected static string $method = Method::DELETE;
 
-    public static string $targetResourceClass = Payment::class;
+    protected $hydratableResource = Payment::class;
 
     protected string $id;
 

src/Http/Requests/CancelSessionRequest.php

@@ -9,7 +9,7 @@ class CancelSessionRequest extends ResourceHydratableRequest
 {
     protected static string $method = Method::DELETE;
 
-    public static string $targetResourceClass = Session::class;
+    protected $hydratableResource = Session::class;
 
     private string $sessionId;
 

src/Http/Requests/CancelSubscriptionRequest.php

@@ -16,7 +16,7 @@ class CancelSubscriptionRequest extends ResourceHydratableRequest implements Sup
     /**
      * The resource class the request should be casted to.
      */
-    public static string $targetResourceClass = Subscription::class;
+    protected $hydratableResource = Subscription::class;
 
     private string $customerId;
 

src/Http/Requests/CreateClientLinkRequest.php

@@ -20,7 +20,7 @@ class CreateClientLinkRequest extends ResourceHydratableRequest implements HasPa
     /**
      * The resource class the request should be casted to.
      */
-    public static string $targetResourceClass = ClientLink::class;
+    protected $hydratableResource = ClientLink::class;
 
     private CreateClientLinkPayload $payload;
 

src/Http/Requests/CreateCustomerRequest.php

@@ -15,7 +15,7 @@ class CreateCustomerRequest extends ResourceHydratableRequest implements HasPayl
 
     protected static string $method = Method::POST;
 
-    public static string $targetResourceClass = Customer::class;
+    protected $hydratableResource = Customer::class;
 
     private CreateCustomerPayload $payload;
 

src/Http/Requests/CreateMandateRequest.php

@@ -21,7 +21,7 @@ class CreateMandateRequest extends ResourceHydratableRequest implements HasPaylo
     /**
      * The resource class the request should be casted to.
      */
-    public static string $targetResourceClass = Mandate::class;
+    protected $hydratableResource = Mandate::class;
 
     private string $customerId;
 

src/Http/Requests/CreatePaymentCaptureRequest.php

@@ -21,7 +21,7 @@ class CreatePaymentCaptureRequest extends ResourceHydratableRequest implements H
     /**
      * The resource class the request should be casted to.
      */
-    public static string $targetResourceClass = Capture::class;
+    protected $hydratableResource = Capture::class;
 
     private string $paymentId;
 

src/Http/Requests/CreatePaymentLinkRequest.php

@@ -20,7 +20,7 @@ class CreatePaymentLinkRequest extends ResourceHydratableRequest implements HasP
     /**
      * The resource class the request should be casted to.
      */
-    public static string $targetResourceClass = PaymentLink::class;
+    protected $hydratableResource = PaymentLink::class;
 
     private CreatePaymentLinkPayload $payload;
 

src/Http/Requests/CreatePaymentRefundRequest.php

@@ -20,7 +20,7 @@ class CreatePaymentRefundRequest extends ResourceHydratableRequest implements Ha
     /**
      * The resource class the request should be casted to.
      */
-    public static string $targetResourceClass = \Mollie\Api\Resources\Refund::class;
+    protected $hydratableResource = \Mollie\Api\Resources\Refund::class;
 
     private string $paymentId;
 

src/Http/Requests/CreatePaymentRequest.php

@@ -22,7 +22,7 @@ class CreatePaymentRequest extends ResourceHydratableRequest implements HasPaylo
     /**
      * The resource class the request should be casted to.
      */
-    public static string $targetResourceClass = Payment::class;
+    protected $hydratableResource = Payment::class;
 
     private CreatePaymentPayload $payload;
 

src/Http/Requests/CreateProfileRequest.php

@@ -20,7 +20,7 @@ class CreateProfileRequest extends ResourceHydratableRequest implements HasPaylo
     /**
      * The resource class the request should be casted to.
      */
-    public static string $targetResourceClass = Profile::class;
+    protected $hydratableResource = Profile::class;
 
     private CreateProfilePayload $payload;
 

src/Http/Requests/CreateSalesInvoiceRequest.php

@@ -14,7 +14,7 @@ class CreateSalesInvoiceRequest extends ResourceHydratableRequest implements Has
 
     protected static string $method = Method::POST;
 
-    public static string $targetResourceClass = SalesInvoice::class;
+    protected $hydratableResource = SalesInvoice::class;
 
     private CreateSalesInvoicePayload $payload;
 

src/Http/Requests/CreateSessionRequest.php

@@ -14,7 +14,7 @@ class CreateSessionRequest extends ResourceHydratableRequest implements HasPaylo
 
     protected static string $method = Method::POST;
 
-    public static string $targetResourceClass = Session::class;
+    protected $hydratableResource = Session::class;
 
     private AnyData $payload;