Skip to content

Commit 9837d25

Browse files
committed
updates to laravel caching
1 parent 9ea0b37 commit 9837d25

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/Cache.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Saloon\CachePlugin\Data\CachedResponse;
88
use Saloon\CachePlugin\Drivers\FlysystemDriver;
99
use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
10+
use \Illuminate\Support\Facades\Cache as LaravelCache;
1011

1112
class Cache
1213
{
@@ -19,10 +20,10 @@ public static function fileSystem(): Filesystem
1920
);
2021
}
2122

22-
public static function driver(): FlysystemDriver
23+
public static function driver(): FlysystemDriver|LaravelCacheDriver
2324
{
24-
if (class_exists('\Illuminate\Support\Facades\Cache')) {
25-
return new LaravelCacheDriver(\Illuminate\Support\Facades\Cache::getDefaultDriver());
25+
if (class_exists(LaravelCache::class)) {
26+
return new LaravelCacheDriver(LaravelCache::repository(LaravelCache::getStore()));
2627
} else {
2728
self::purgeExpired();
2829
return new FlysystemDriver(

src/Requests/QueryDataRequest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
use FredBradley\PhpSteerApi\Cache;
66
use Saloon\CachePlugin\Contracts\Cacheable;
77
use Saloon\CachePlugin\Contracts\Driver;
8+
use Saloon\CachePlugin\Drivers\FlysystemDriver;
9+
use Saloon\CachePlugin\Drivers\LaravelCacheDriver;
810
use Saloon\CachePlugin\Traits\HasCaching;
911
use Saloon\Contracts\Body\HasBody;
1012
use Saloon\Http\PendingRequest;
@@ -52,7 +54,7 @@ public function resolveEndpoint(): string
5254
return 'query-data';
5355
}
5456

55-
public function resolveCacheDriver(): Driver
57+
public function resolveCacheDriver(): LaravelCacheDriver|FlysystemDriver
5658
{
5759
return Cache::driver();
5860
}

0 commit comments

Comments
 (0)