Merge pull request #286 from saloonphp/feature/v3-remove-interfaces

Feature | V3 Remove Interfaces
saloonphp · Sep 8, 2023 · 11a995a · 11a995a
2 parents ed0645e + a62ced6
commit 11a995a
Show file tree

Hide file tree

Showing 121 changed files with 695 additions and 1,843 deletions.
diff --git a/phpstan.baseline.neon b/phpstan.baseline.neon
@@ -21,17 +21,12 @@ parameters:
 			path: src/Http/Faking/Fixture.php
 
 		-
-			message: "#^Method Saloon\\\\Http\\\\Faking\\\\MockClient\\:\\:getLastResponse\\(\\) should return Saloon\\\\Contracts\\\\Response\\|null but returns \\(callable\\)\\|Saloon\\\\Http\\\\Faking\\\\Fixture\\|Saloon\\\\Http\\\\Faking\\\\MockResponse\\.$#"
+			message: "#^Method Saloon\\\\Http\\\\Faking\\\\MockClient\\:\\:getLastResponse\\(\\) should return Saloon\\\\Http\\\\Response\\|null but returns \\(callable\\)\\|Saloon\\\\Http\\\\Faking\\\\Fixture\\|Saloon\\\\Http\\\\Faking\\\\MockResponse\\.$#"
 			count: 1
 			path: src/Http/Faking/MockClient.php
 
 		-
-			message: "#^Method Saloon\\\\Http\\\\Faking\\\\MockClient\\:\\:getRecordedResponses\\(\\) should return array\\<Saloon\\\\Contracts\\\\Response\\> but returns array\\<\\(callable\\)\\|Saloon\\\\Http\\\\Faking\\\\Fixture\\|Saloon\\\\Http\\\\Faking\\\\MockResponse\\>\\.$#"
-			count: 1
-			path: src/Http/Faking/MockClient.php
-
-		-
-			message: "#^Property Saloon\\\\Http\\\\Faking\\\\MockClient\\:\\:\\$recordedResponses \\(array\\<\\(callable\\(\\)\\: mixed\\)\\|Saloon\\\\Http\\\\Faking\\\\Fixture\\|Saloon\\\\Http\\\\Faking\\\\MockResponse\\>\\) does not accept non\\-empty\\-array\\<\\(callable\\(\\)\\: mixed\\)\\|Saloon\\\\Contracts\\\\Response\\|Saloon\\\\Http\\\\Faking\\\\Fixture\\|Saloon\\\\Http\\\\Faking\\\\MockResponse\\>\\.$#"
+			message: "#^Method Saloon\\\\Http\\\\Faking\\\\MockClient\\:\\:getRecordedResponses\\(\\) should return array\\<Saloon\\\\Http\\\\Response\\> but returns array\\<\\(callable\\)\\|Saloon\\\\Http\\\\Faking\\\\Fixture\\|Saloon\\\\Http\\\\Faking\\\\MockResponse\\>\\.$#"
 			count: 1
 			path: src/Http/Faking/MockClient.php
 
@@ -91,26 +86,21 @@ parameters:
 		 path: src/Data/MultipartValue.php
 
 		-
-		 message: "#^Parameter \\#1 \\$response of method Saloon\\\\Contracts\\\\PendingRequest\\:\\:executeResponsePipeline\\(\\) expects Saloon\\\\Contracts\\\\Response\\, GuzzleHttp\\\\Promise\\\\PromiseInterface\\|Saloon\\\\Contracts\\\\Response given.$#"
-		 count: 1
-		 path: src/Traits/Connector/SendsRequests.php
-
-		-
-		 message: "#^Call to an undefined method GuzzleHttp\\\\Promise\\\\PromiseInterface\\|Saloon\\\\Contracts\\\\Response\\:\\:then\\(\\).$#"
+		 message: "#^Parameter \\#1 \\$response of method Saloon\\\\Http\\\\PendingRequest\\:\\:executeResponsePipeline\\(\\) expects Saloon\\\\Http\\\\Response\\, GuzzleHttp\\\\Promise\\\\PromiseInterface\\|Saloon\\\\Http\\\\Response given.$#"
 		 count: 1
 		 path: src/Traits/Connector/SendsRequests.php
 
 		-
-		 message: "#^Access to an undefined property Saloon\\\\Contracts\\\\Request\\:\\:\\$tries.$#"
+		 message: "#^Call to an undefined method GuzzleHttp\\\\Promise\\\\PromiseInterface\\|Saloon\\\\Http\\\\Response\\:\\:then\\(\\).$#"
 		 count: 1
 		 path: src/Traits/Connector/SendsRequests.php
 
 		-
-		 message: "#^Access to an undefined property Saloon\\\\Contracts\\\\Request\\:\\:\\$retryInterval.$#"
+		 message: "#^Property Saloon\\\\Http\\\\Faking\\\\MockClient::$recordedResponses (array<(callable():mixed)|Saloon\\\\Http\\\\Faking\\\\Fixture|Saloon\\\\Http\\\\Faking\\\\MockResponse>) does not accept non-empty-array<(callable():mixed)|Saloon\\\\Http\\\\Faking\\\\Fixture|Saloon\\\\Http\\\\Faking\\\\MockResponse|Saloon\\\\Http\\\\Response>.$#"
 		 count: 1
-		 path: src/Traits/Connector/SendsRequests.php
+		 path: src/Http/Faking/MockClient.php
 
 		-
-		 message: "#^Access to an undefined property Saloon\\\\Contracts\\\\Request\\:\\:\\$throwOnMaxTries.$#"
+		 message: "#^Match arm is unreachable because previous comparison is always true.$#"
 		 count: 1
-		 path: src/Traits/Connector/SendsRequests.php
+		 path: src/Http/Pool.php
diff --git a/src/Contracts/Authenticatable.php b/src/Contracts/Authenticatable.php
diff --git a/src/Contracts/Authenticator.php b/src/Contracts/Authenticator.php
@@ -4,6 +4,8 @@
 
 namespace Saloon\Contracts;
 
+use Saloon\Http\PendingRequest;
+
 interface Authenticator
 {
     /**

diff --git a/src/Contracts/CanThrowRequestExceptions.php b/src/Contracts/CanThrowRequestExceptions.php
diff --git a/src/Contracts/Connector.php b/src/Contracts/Connector.php
diff --git a/src/Contracts/DataObjects/WithResponse.php b/src/Contracts/DataObjects/WithResponse.php
@@ -4,7 +4,7 @@
 
 namespace Saloon\Contracts\DataObjects;
 
-use Saloon\Contracts\Response;
+use Saloon\Http\Response;
 
 interface WithResponse
 {

diff --git a/src/Contracts/FakeResponse.php b/src/Contracts/FakeResponse.php
@@ -7,14 +7,12 @@
 use Closure;
 use Throwable;
 use Saloon\Http\Faking\Fixture;
+use Saloon\Http\PendingRequest;
 use Psr\Http\Message\ResponseInterface;
 use Saloon\Contracts\Body\BodyRepository;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 
-/**
- * @method static static make(mixed $body = [], int $status = 200, array $headers = []) Create a new mock response
- */
 interface FakeResponse
 {
     /**
@@ -39,11 +37,6 @@ public function body(): BodyRepository;
      */
     public function throw(Closure|Throwable $value): static;
 
-    /**
-     * Checks if the response throws an exception.
-     */
-    public function throwsException(): bool;
-
     /**
      * Get the exception
      */

diff --git a/src/Contracts/HasConfig.php b/src/Contracts/HasConfig.php
diff --git a/src/Contracts/HasDebugging.php b/src/Contracts/HasDebugging.php
diff --git a/src/Contracts/HasDelay.php b/src/Contracts/HasDelay.php
diff --git a/src/Contracts/HasHeaders.php b/src/Contracts/HasHeaders.php
diff --git a/src/Contracts/HasMiddlewarePipeline.php b/src/Contracts/HasMiddlewarePipeline.php
diff --git a/src/Contracts/HasMockClient.php b/src/Contracts/HasMockClient.php
diff --git a/src/Contracts/HasQueryParams.php b/src/Contracts/HasQueryParams.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ @@
     namespace Saloon\Contracts;
+    use Saloon\Http\PendingRequest;
     interface Authenticator
     {
         /**
@@ Expand Down @@