Fixing tests

src/Casts/OAuthAuthenticatorCast.php

@@ -3,8 +3,8 @@
 namespace Saloon\Laravel\Casts;
 
 use InvalidArgumentException;
-use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Saloon\Contracts\OAuthAuthenticator;
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 
 class OAuthAuthenticatorCast implements CastsAttributes
 {

src/Facades/Saloon.php

@@ -2,12 +2,12 @@
 
 namespace Saloon\Laravel\Facades;
 
-use Saloon\Contracts\SaloonResponse;
+use Saloon\Contracts\Response;
 use Saloon\Laravel\Http\Faking\MockClient;
 use Illuminate\Support\Facades\Facade as BaseFacade;
 
 /**
- * @see \Sammyjo20\SaloonLaravel\Saloon
+ * @see \Saloon\Laravel\Saloon
  *
  * @method static MockClient fake(array $responses)
  * @method static MockClient mockClient()
@@ -19,8 +19,9 @@
  * @method static void record()
  * @method static void stopRecording()
  * @method static bool isRecording()
- * @method static SaloonResponse[] getRecordedResponses()
- * @method static SaloonResponse getLastRecordedResponse()
+ * @method static void recordResponse(Response $response)
+ * @method static \Saloon\Contracts\Response[] getRecordedResponses()
+ * @method static \Saloon\Contracts\Response getLastRecordedResponse()
  */
 class Saloon extends BaseFacade
 {

src/Http/Middleware/FrameworkMiddleware.php

@@ -72,7 +72,7 @@ protected function bootRecordingFeature(PendingRequest $pendingRequest): static
 
         $pendingRequest->middleware()->onResponse(function (Response $response): void {
             Saloon::recordResponse($response);
-        });
+        }, true);
 
         return $this;
     }
@@ -94,7 +94,7 @@ protected function bootEventTriggers(PendingRequest $pendingRequest): static
 
         $pendingRequest->middleware()->onResponse(function (Response $response): void {
             SentSaloonRequest::dispatch($response->getPendingRequest(), $response);
-        });
+        }, true);
 
         return $this;
     }

src/Saloon.php

@@ -2,6 +2,7 @@
 
 namespace Saloon\Laravel;
 
+use Saloon\Contracts\Response;
 use Saloon\Laravel\Http\Faking\MockClient;
 
 class Saloon
@@ -24,8 +25,8 @@ class Saloon
      * Start mocking!
      *
      * @param array $responses
-     * @return MockClient
-     * @throws \Sammyjo20\Saloon\Exceptions\SaloonInvalidMockResponseCaptureMethodException
+     * @return \Saloon\Laravel\Http\Faking\MockClient
+     * @throws \Saloon\Exceptions\InvalidMockResponseCaptureMethodException
      */
     public static function fake(array $responses): MockClient
     {
@@ -133,10 +134,10 @@ public function isRecording(): bool
     /**
      * Record a response.
      *
-     * @param SaloonResponse $response
+     * @param Response $response
      * @return void
      */
-    public function recordResponse(SaloonResponse $response): void
+    public function recordResponse(Response $response): void
     {
         $this->recordedResponses[] = $response;
     }
@@ -154,9 +155,9 @@ public function getRecordedResponses(): array
     /**
      * Get the last response that Saloon recorded.
      *
-     * @return SaloonResponse|null
+     * @return Response|null
      */
-    public function getLastRecordedResponse(): ?SaloonResponse
+    public function getLastRecordedResponse(): ?Response
     {
         if (empty($this->recordedResponses)) {
             return null;

tests/Feature/EventsTest.php

@@ -1,12 +1,12 @@
 <?php declare(strict_types=1);
 
-use Saloon\Http\Faking\MockResponse;
-use Saloon\Laravel\Events\SendingSaloonRequest;
 use Saloon\Laravel\Facades\Saloon;
+use Saloon\Http\Faking\MockResponse;
 use Illuminate\Support\Facades\Event;
 use Saloon\Laravel\Events\SentSaloonRequest;
-use Saloon\Laravel\Tests\Fixtures\Connectors\TestConnector;
+use Saloon\Laravel\Events\SendingSaloonRequest;
 use Saloon\Laravel\Tests\Fixtures\Requests\UserRequest;
+use Saloon\Laravel\Tests\Fixtures\Connectors\TestConnector;
 
 test('events are fired when a request is being sent and when a request has been sent', function () {
     Saloon::fake([

tests/Feature/MockRequestTest.php

@@ -4,11 +4,11 @@
 use Saloon\Contracts\PendingRequest;
 use Saloon\Http\Faking\MockResponse;
 use Saloon\Exceptions\NoMockResponsesProvidedException;
-use Saloon\Laravel\Tests\Fixtures\Connectors\DifferentServiceConnector;
 use Saloon\Laravel\Tests\Fixtures\Requests\UserRequest;
 use Saloon\Laravel\Tests\Fixtures\Requests\ErrorRequest;
 use Saloon\Laravel\Tests\Fixtures\Connectors\TestConnector;
 use Saloon\Laravel\Tests\Fixtures\Connectors\QueryParameterConnector;
+use Saloon\Laravel\Tests\Fixtures\Connectors\DifferentServiceConnector;
 use Saloon\Laravel\Tests\Fixtures\Requests\DifferentServiceUserRequest;
 use Saloon\Laravel\Tests\Fixtures\Requests\QueryParameterConnectorRequest;
 

tests/Feature/PoolTest.php

@@ -2,19 +2,16 @@
 
 use Saloon\Http\PendingRequest;
 use Saloon\Http\Faking\MockClient;
-use Saloon\Contracts\SaloonResponse;
+use Saloon\Http\Responses\Response;
 use Saloon\Http\Faking\MockResponse;
-use Saloon\Http\Responses\PsrResponse;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Exception\ConnectException;
 use Saloon\Exceptions\FatalRequestException;
-use Saloon\Http\Responses\Response;
-use Saloon\Http\Responses\SimulatedResponse;
+use Saloon\Contracts\Response as ResponseContract;
 use Saloon\Laravel\Tests\Fixtures\Requests\UserRequest;
 use Saloon\Laravel\Tests\Fixtures\Requests\ErrorRequest;
 use Saloon\Laravel\Tests\Fixtures\Connectors\TestConnector;
 use Saloon\Laravel\Tests\Fixtures\Connectors\InvalidConnectionConnector;
-use Saloon\Contracts\Response as ResponseContract;
 
 test('you can create a pool on a connector', function () {
     $connector = new TestConnector;