Merge pull request #6 from Sammyjo20/feature/v2-mock-client

Feature | Fixes for beta 3

Author: Sammyjo20

composer.json

@@ -18,7 +18,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": "^8.1",
-        "sammyjo20/saloon": "2.0.0-beta2"
+        "sammyjo20/saloon": "2.0.0-beta3"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.13",

src/Http/Middleware/CacheMiddleware.php

@@ -69,7 +69,7 @@ public function __invoke(PendingRequest $pendingRequest): ?SimulatedResponsePayl
         // the prepend option, so it runs first.
 
         $pendingRequest->middleware()->onResponse(
-            closure: new CacheRecorderMiddleware($driver, $this->ttl, $cacheKey),
+            callable: new CacheRecorderMiddleware($driver, $this->ttl, $cacheKey),
             prepend: true,
         );
 

src/Traits/HasCaching.php

@@ -62,7 +62,7 @@ public function bootHasCaching(PendingRequest $pendingRequest): void
         // of real responses for caching.
 
         $pendingRequest->middleware()->onRequest(
-            closure: new CacheMiddleware($cacheDriver, $cacheExpiryInSeconds, $this->cacheKey($pendingRequest), $this->invalidateCache),
+            callable: new CacheMiddleware($cacheDriver, $cacheExpiryInSeconds, $this->cacheKey($pendingRequest), $this->invalidateCache),
         );
     }
 

tests/Feature/CacheTest.php

@@ -58,8 +58,9 @@
     expect($responseA->header('X-Howdy'))->toEqual('Yeehaw');
 
     // Now send a response without the mock middleware, and it should be cached!
+    // We'll also pass the mock client in here to ensure it's being ignored
 
-    $responseB = TestConnector::make()->send(new CachedUserRequest);
+    $responseB = TestConnector::make()->send(new CachedUserRequest, $mockClient);
 
     expect($responseB->isSimulated())->toBeTrue();
     expect($responseB->isCached())->toBeTrue();