Skip to content

Commit b38ef90

Browse files
committed
Fix caching plugin
1 parent eba7c78 commit b38ef90

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"minimum-stability": "stable",
1919
"require": {
2020
"php": "^8.1",
21-
"saloonphp/saloon": "^3.0.0-beta.4"
21+
"saloonphp/saloon": "^3.0.0-beta.5"
2222
},
2323
"require-dev": {
2424
"friendsofphp/php-cs-fixer": "^3.13",

src/Traits/HasCaching.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Saloon\CachePlugin\Traits;
66

77
use Saloon\Enums\Method;
8+
use Saloon\Enums\PipeOrder;
89
use Saloon\Http\PendingRequest;
910
use Saloon\CachePlugin\Contracts\Cacheable;
1011
use Saloon\CachePlugin\Exceptions\HasCachingException;
@@ -25,7 +26,9 @@ trait HasCaching
2526
/**
2627
* Boot the "HasCaching" plugin
2728
*
29+
* @param \Saloon\Http\PendingRequest $pendingRequest
2830
* @throws \Saloon\CachePlugin\Exceptions\HasCachingException
31+
* @throws \Saloon\Exceptions\DuplicatePipeNameException
2932
*/
3033
public function bootHasCaching(PendingRequest $pendingRequest): void
3134
{
@@ -62,7 +65,7 @@ public function bootHasCaching(PendingRequest $pendingRequest): void
6265
// properties.
6366

6467
return call_user_func(new CacheMiddleware($cacheDriver, $cacheExpiryInSeconds, $this->cacheKey($middlewarePendingRequest), $this->invalidateCache), $middlewarePendingRequest);
65-
});
68+
}, order: PipeOrder::FIRST);
6669
}
6770

6871
/**

tests/Feature/CacheTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
$responseA = TestConnector::make()->send(new CachedUserRequest, $mockClient);
5656

5757
expect($responseA->isCached())->toBeFalse();
58+
expect($responseA->isMocked())->toBeTrue();
5859
expect($responseA->status())->toEqual(201);
5960
expect($responseA->json())->toEqual(['name' => 'Sam']);
6061
expect($responseA->header('X-Howdy'))->toEqual('Yeehaw');
@@ -66,6 +67,7 @@
6667

6768
expect($responseB->isFaked())->toBeTrue();
6869
expect($responseB->isCached())->toBeTrue();
70+
expect($responseB->isMocked())->toBeFalse();
6971
expect($responseB->status())->toEqual(201);
7072
expect($responseB->json())->toEqual(['name' => 'Sam']);
7173
expect($responseB->header('X-Howdy'))->toEqual('Yeehaw');

tests/Fixtures/Requests/BodyCacheKeyRequest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ public function cacheExpiryInSeconds(): int
4343

4444
protected function cacheKey(PendingRequest $pendingRequest): ?string
4545
{
46-
dd($pendingRequest->body());
47-
4846
return (string)$pendingRequest->body()->get();
4947
}
5048
}

0 commit comments

Comments
 (0)