upgrade saloon to v3.10

composer.json

@@ -19,7 +19,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": "^8.2",
-        "saloonphp/saloon": "^1.7"
+        "saloonphp/saloon": "^3.10"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.64",

src/Carbone.php

@@ -11,13 +11,13 @@
 use Carboneio\SDK\Requests\StatusRequest;
 
 /** Saloon Class */
-use Sammyjo20\Saloon\Http\SaloonConnector;
-use Sammyjo20\Saloon\Traits\Plugins\AcceptsJson;
-use Sammyjo20\Saloon\Http\Auth\TokenAuthenticator;
-use Sammyjo20\Saloon\Http\SaloonResponse;
-use Sammyjo20\Saloon\Interfaces\AuthenticatorInterface;
+use Saloon\Http\Connector;
+use Saloon\Traits\Plugins\AcceptsJson;
+use Saloon\Http\Auth\TokenAuthenticator;
+use Saloon\Http\Response;
+use Saloon\Contracts\Authenticator;
 
-class Carbone extends SaloonConnector
+class Carbone extends Connector
 {
     use AcceptsJson;
 
@@ -50,7 +50,7 @@ class Carbone extends SaloonConnector
      *
      * @return string
      */
-    public function defineBaseUrl(): string
+    public function resolveBaseUrl(): string
     {
         return $this->apiBaseUrl;
     }
@@ -65,7 +65,7 @@ public function __construct(private string $token, string $baseUrl = null)
         }
     }
 
-    public function defaultAuth(): ?AuthenticatorInterface
+    public function defaultAuth(): ?Authenticator
     {
         return new TokenAuthenticator($this->token);
     }
@@ -83,8 +83,6 @@ public function defaultHeaders(): array
         ];
     }
 
-
-
     /**
      * Define any default config.
      *
@@ -97,13 +95,23 @@ public function defaultConfig(): array
         ];
     }
 
+    public function templates(): TemplatesCollection
+    {
+        return new TemplatesCollection($this);
+    }
+
+    public function renders(): RendersCollection
+    {
+        return new RendersCollection($this);
+    }
+
     public function getToken(): string
     {
         return $this->token;
     }
 
-    public function getStatus(): SaloonResponse
+    public function getStatus(): Response
     {
-        return $this->request(new StatusRequest())->send();
+        return $this->send(new StatusRequest());
     }
 }

src/Exceptions/CarboneSdkRequestException.php

@@ -2,17 +2,17 @@
 
 namespace Carboneio\SDK\Exceptions;
 
-use Sammyjo20\Saloon\Http\SaloonResponse;
-use Sammyjo20\Saloon\Exceptions\SaloonRequestException;
+use Saloon\Http\Response;
+use Saloon\Exceptions\Request\RequestException;
 
-class CarboneSdkRequestException extends SaloonRequestException
+class CarboneSdkRequestException extends RequestException
 {
     /**
      * Retrieve the response.
      *
      * @return SaloonResponse
      */
-    public function getResponse(): SaloonResponse
+    public function getResponse(): Response
     {
         return $this->getSaloonResponse();
     }

src/Requests/Reports/DownloadReportRequest.php

@@ -3,22 +3,24 @@
 namespace Carboneio\SDK\Requests\Reports;
 
 /** Saloon Class */
-use Sammyjo20\Saloon\Constants\Saloon;
-use Sammyjo20\Saloon\Traits\Plugins\HasJsonBody;
-use Sammyjo20\Saloon\Http\SaloonRequest;
+use Saloon\Constants\Saloon;
+use Saloon\Contracts\Body\HasBody;
+use Saloon\Traits\Body\HasJsonBody;
+use Saloon\Http\Request;
+use Saloon\Enums\Method;
 
-class DownloadReportRequest extends SaloonRequest
+class DownloadReportRequest extends Request implements HasBody
 {
     use HasJsonBody;
 
-    protected ?string $method = Saloon::GET;
+    protected Method $method = Method::GET;
 
     public function __construct(
         private string $renderId,
     ) {
     }
 
-    public function defineEndpoint(): string
+    public function resolveEndpoint(): string
     {
         return '/render/' . $this->renderId;
     }

src/Requests/Reports/RenderReportRequest.php

@@ -3,18 +3,20 @@
 namespace Carboneio\SDK\Requests\Reports;
 
 /** Saloon */
-use Sammyjo20\Saloon\Constants\Saloon;
-use Sammyjo20\Saloon\Traits\Plugins\HasJsonBody;
-use Sammyjo20\Saloon\Http\SaloonRequest;
+use Saloon\Constants\Saloon;
+use Saloon\Contracts\Body\HasBody;
+use Saloon\Traits\Body\HasJsonBody;
+use Saloon\Http\Request;
+use Saloon\Enums\Method;
 
 /** Carbone SDK Class */
 use Carboneio\SDK\Responses\RenderReportResponse;
 
-class RenderReportRequest extends SaloonRequest
+class RenderReportRequest extends Request implements HasBody
 {
     use HasJsonBody;
 
-    protected ?string $method = Saloon::POST;
+    protected Method $method = Method::POST;
 
     protected ?string $response = RenderReportResponse::class;
 
@@ -24,12 +26,12 @@ public function __construct(
     ) {
     }
 
-    public function defineEndpoint(): string
+    public function resolveEndpoint(): string
     {
         return '/render/' . $this->templateId;
     }
 
-    public function defaultData(): array
+    public function defaultBody(): array
     {
         return $this->data;
     }

src/Requests/StatusRequest.php

@@ -3,20 +3,22 @@
 namespace Carboneio\SDK\Requests;
 
 /** Saloon Class */
-use Sammyjo20\Saloon\Constants\Saloon;
-use Sammyjo20\Saloon\Traits\Plugins\HasJsonBody;
-use Sammyjo20\Saloon\Http\SaloonRequest;
+use Saloon\Constants\Saloon;
+use Saloon\Contracts\Body\HasBody;
+use Saloon\Traits\Body\HasJsonBody;
+use Saloon\Http\Request;
+use Saloon\Enums\Method;
 
-class StatusRequest extends SaloonRequest
+class StatusRequest extends Request implements HasBody
 {
     use HasJsonBody;
 
-    protected ?string $method = Saloon::GET;
+    protected Method $method = Method::GET;
 
     public function __construct() {
     }
 
-    public function defineEndpoint(): string
+    public function resolveEndpoint(): string
     {
         return '/status';
     }

src/Requests/Templates/DeleteTemplateRequest.php

@@ -3,22 +3,24 @@
 namespace Carboneio\SDK\Requests\Templates;
 
 /** Saloon Class */
-use Sammyjo20\Saloon\Constants\Saloon;
-use Sammyjo20\Saloon\Traits\Plugins\HasJsonBody;
-use Sammyjo20\Saloon\Http\SaloonRequest;
+use Saloon\Constants\Saloon;
+use Saloon\Contracts\Body\HasBody;
+use Saloon\Traits\Body\HasJsonBody;
+use Saloon\Http\Request;
+use Saloon\Enums\Method;
 
-class DeleteTemplateRequest extends SaloonRequest
+class DeleteTemplateRequest extends Request implements HasBody
 {
     use HasJsonBody;
 
-    protected ?string $method = Saloon::DELETE;
+    protected Method $method = Method::DELETE;
 
     public function __construct(
         private string $templateId
     ) {
     }
 
-    public function defineEndpoint(): string
+    public function resolveEndpoint(): string
     {
         return '/template/' . $this->templateId;
     }

src/Requests/Templates/DownloadTemplateRequest.php

@@ -3,22 +3,24 @@
 namespace Carboneio\SDK\Requests\Templates;
 
 /** Saloon Class */
-use Sammyjo20\Saloon\Constants\Saloon;
-use Sammyjo20\Saloon\Traits\Plugins\HasJsonBody;
-use Sammyjo20\Saloon\Http\SaloonRequest;
+use Saloon\Constants\Saloon;
+use Saloon\Contracts\Body\HasBody;
+use Saloon\Traits\Body\HasJsonBody;
+use Saloon\Http\Request;
+use Saloon\Enums\Method;
 
-class DownloadTemplateRequest extends SaloonRequest
+class DownloadTemplateRequest extends Request implements HasBody
 {
     use HasJsonBody;
 
-    protected ?string $method = Saloon::GET;
+    protected Method $method = Method::GET;
 
     public function __construct(
         private string $templateId
     ) {
     }
 
-    public function defineEndpoint(): string
+    public function resolveEndpoint(): string
     {
         return '/template/' . $this->templateId;
     }

src/Requests/Templates/UploadTemplateRequest.php

@@ -3,18 +3,20 @@
 namespace Carboneio\SDK\Requests\Templates;
 
 /** Saloon Class */
-use Sammyjo20\Saloon\Constants\Saloon;
-use Sammyjo20\Saloon\Traits\Plugins\HasJsonBody;
-use Sammyjo20\Saloon\Http\SaloonRequest;
+use Saloon\Constants\Saloon;
+use Saloon\Contracts\Body\HasBody;
+use Saloon\Traits\Body\HasJsonBody;
+use Saloon\Http\Request;
+use Saloon\Enums\Method;
 
 /** Carbone SDK Class */
 use Carboneio\SDK\Responses\UploadTemplateResponse;
 
-class UploadTemplateRequest extends SaloonRequest
+class UploadTemplateRequest extends Request implements HasBody
 {
     use HasJsonBody;
 
-    protected ?string $method = Saloon::POST;
+    protected Method $method = Method::POST;
 
     protected ?string $response = UploadTemplateResponse::class;
 
@@ -23,12 +25,12 @@ public function __construct(
     ) {
     }
 
-    public function defineEndpoint(): string
+    public function resolveEndpoint(): string
     {
         return '/template';
     }
 
-    public function defaultData(): array
+    public function defaultBody(): array
     {
         return [
             'template' => $this->templateAsBase64,

src/RequestsCollection/RendersCollection.php

@@ -2,9 +2,6 @@
 
 namespace Carboneio\SDK\RequestsCollection;
 
-/** Saloon Abstracts */
-use Sammyjo20\Saloon\Http\RequestCollection;
-
 /** Requests */
 use Carboneio\SDK\Requests\Reports\RenderReportRequest;
 use Carboneio\SDK\Requests\Reports\DownloadReportRequest;
@@ -13,20 +10,26 @@
 use Carboneio\SDK\Responses\CarboneSdkResponse;
 use Carboneio\SDK\Responses\RenderReportResponse;
 
-class RendersCollection extends RequestCollection
+use Saloon\Repositories\RequestCollection;
+use Saloon\Http\Connector;
+
+class RendersCollection
 {
+    protected Connector $connector;
+
+    public function __construct(Connector $connector)
+    {
+        $this->connector = $connector;
+    }
+
     public function render(string $templateId, array $data): RenderReportResponse
     {
-        return (new RenderReportRequest($templateId, $data))
-            ->setConnector($this->connector)
-            ->send();
+        return $this->connector->send(new RenderReportRequest($templateId, $data));
     }
 
     public function download(string $renderId): CarboneSdkResponse
     {
-        return (new DownloadReportRequest($renderId))
-            ->setConnector($this->connector)
-            ->send();
+        return $this->connector->send(new DownloadReportRequest($renderId));
     }
 }