Merge pull request #8 from craigpotter/feature/upgrade-saloon-to-v3

Upgrade Saloon to v3
craigpotter · Oct 21, 2023 · 982d184 · 982d184
2 parents 20f76bb + 6983bc1
commit 982d184
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -13,8 +13,8 @@
     "homepage": "https://github.com/craigpotter",
     "require": {
         "php": "^8.1",
-        "saloonphp/saloon": "^2.0",
-        "saloonphp/pagination-plugin": "^1.0"
+        "saloonphp/saloon": "^3.0",
+        "saloonphp/pagination-plugin": "^2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.5",

diff --git a/src/Fca.php b/src/Fca.php
@@ -5,8 +5,8 @@
 namespace CraigPotter\Fca;
 
 use Saloon\Http\Connector;
-use Saloon\Contracts\Request;
-use Saloon\Contracts\Response;
+use Saloon\Http\Request;
+use Saloon\Http\Response;
 use Saloon\PaginationPlugin\Paginator;
 use CraigPotter\Fca\Requests\GetEndpoint;
 use CraigPotter\Fca\Resources\FirmResource;

diff --git a/src/Requests/Firm/GetFirmAddresses.php b/src/Requests/Firm/GetFirmAddresses.php
@@ -6,7 +6,7 @@
 
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 use CraigPotter\Fca\DataObjects\Address;
 use Saloon\PaginationPlugin\Contracts\Paginatable;
 

diff --git a/src/Requests/Firm/GetFirmDetails.php b/src/Requests/Firm/GetFirmDetails.php
@@ -6,7 +6,7 @@
 
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 use CraigPotter\Fca\DataObjects\Firm;
 
 class GetFirmDetails extends Request

diff --git a/src/Requests/Firm/GetFirmIndividuals.php b/src/Requests/Firm/GetFirmIndividuals.php
@@ -6,7 +6,7 @@
 
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 use CraigPotter\Fca\DataObjects\Individual;
 use Saloon\PaginationPlugin\Contracts\Paginatable;
 

diff --git a/src/Resources/FirmResource.php b/src/Resources/FirmResource.php
@@ -4,6 +4,7 @@
 
 namespace CraigPotter\Fca\Resources;
 
+use Saloon\Http\Connector;
 use Saloon\Http\Response;
 use Saloon\PaginationPlugin\PagedPaginator;
 use Saloon\Exceptions\Request\RequestException;
@@ -13,7 +14,7 @@
 
 class FirmResource extends Resource
 {
-    public function __construct(protected \Saloon\Contracts\Connector $connector, public readonly int $frn)
+    public function __construct(protected Connector $connector, public readonly int $frn)
     {
         parent::__construct($connector);
     }

diff --git a/src/Resources/Resource.php b/src/Resources/Resource.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 namespace CraigPotter\Fca\Resources;
 
-use Saloon\Contracts\Connector;
+use Saloon\Http\Connector;
 
 class Resource
 {

diff --git a/tests/Feature/FirmResourceTest.php b/tests/Feature/FirmResourceTest.php
@@ -4,7 +4,7 @@
 
 use CraigPotter\Fca\Fca;
 use Saloon\Http\Faking\MockClient;
-use Saloon\Contracts\PendingRequest;
+use Saloon\Http\PendingRequest;
 use Saloon\Http\Faking\MockResponse;
 use CraigPotter\Fca\DataObjects\Address;
 use CraigPotter\Fca\DataObjects\Individual;