Adds test for fix.

Author: DarkGhostHunter

README.md

@@ -133,6 +133,10 @@ use App\Models\Article;
 Article::latest('published_at')->take(200)->cache([5, 300])->get();
 ```
 
+> [!WARN]
+> 
+> When using stale revalidation, 
+
 ## Forgetting results with a key
 
 Cache keys are used to identify multiple queries cached with an identifiable name. These are not mandatory, but if you expect to remove a query from the cache, you will need to identify the query with the `key` argument. 

src/CacheAwareConnectionProxy.php

@@ -76,6 +76,11 @@ public function select($query, $bindings = [], $useReadPdo = true)
         // We will use the prefix to operate on the cache directly.
         $key = $this->cachePrefix.'|'.$this->computedKey;
 
+        // If the user is setting an array, we will steer return the results using "flexible".
+        if (is_array($this->ttl) && count($this->ttl) > 1 && method_exists($this->repository, 'flexible')) {
+            return $this->returnResultsUsingFlexible($query, $key, $bindings, $useReadPdo);
+        }
+
         return $this
             ->retrieveLock($key)
             ->block($this->lockWait, function () use ($query, $bindings, $useReadPdo, $key): array {
@@ -84,11 +89,7 @@ public function select($query, $bindings = [], $useReadPdo = true)
                 if ($results === null) {
                     $results = $this->connection->select($query, $bindings, $useReadPdo);
 
-                    if (is_array($this->ttl) && count($this->ttl) > 1 && method_exists($this->repository, 'flexible')) {
-                        $this->repository->flexible($key, $results, $this->ttl);
-                    } else {
-                        $this->repository->put($key, $results, $this->ttl);
-                    }
+                    $this->repository->put($key, $results, $this->ttl);
 
                     // If the user added a user key, we will append this computed key to it and save it.
                     if ($this->userKey) {
@@ -130,7 +131,7 @@ protected function getQueryHash(string $query, array $bindings): string
      */
     protected function retrieveLock(string $key): Lock
     {
-        if (! $this->lockWait) {
+        if (!$this->lockWait) {
             return new NoLock($key, $this->lockWait);
         }
 
@@ -178,8 +179,12 @@ protected function addComputedKeyToUserKey(string $key, ?array $list): void
     /**
      * Gets the timestamp for the expiration time.
      */
-    protected function getTimestamp(DateInterval|DateTimeInterface|int $expiration): int
+    protected function getTimestamp(DateInterval|DateTimeInterface|array|int $expiration): int
     {
+        if (is_array($expiration)) {
+            $expiration = $expiration[1];
+        }
+
         if ($expiration instanceof DateTimeInterface) {
             return $expiration->getTimestamp();
         }
@@ -219,6 +224,23 @@ public function __call($method, $arguments)
         return $this->connection->{$method}(...$arguments);
     }
 
+    /**
+     * Returns the results of the query using stale revalidation.
+     */
+    protected function returnResultsUsingFlexible(string $query, string $key, array $bindings, bool $useReadPdo): mixed
+    {
+        return $this->repository
+            ->flexible($key, $this->ttl, function () use ($query, $bindings, $key, $useReadPdo): mixed {
+                $results = $this->connection->select($query, $bindings, $useReadPdo);
+
+                if ($this->userKey) {
+                    $this->addComputedKeyToUserKey($key, $this->repository->get($this->userKey));
+                }
+
+                return $results;
+            });
+    }
+
     /**
      * Create a new CacheAwareProxy instance.
      */
@@ -247,7 +269,7 @@ protected static function store(?string $store, bool $lockable): Repository
     {
         $repository = cache()->store($store ?? config('cache-query.store'));
 
-        if ($lockable && ! $repository->getStore() instanceof LockProvider) {
+        if ($lockable && !$repository->getStore() instanceof LockProvider) {
             $store ??= cache()->getDefaultDriver();
 
             throw new LogicException("The [$store] cache does not support atomic locks.");

tests/CacheAwareConnectionProxyTest.php

@@ -455,8 +455,8 @@ public function test_uses_db_flexible_caching_when_using_ttl_as_array_of_values(
 
         $repository = $this->mock(CacheRepository::class);
         $repository->expects('put')->never();
-        $repository->expects('flexible')->with($hash, Mockery::type('array'), [5, 300])->once();
-        $repository->expects('getMultiple')->with([$hash, ''])->times(1)->andReturn(['' => null, $hash => null]);
+        $repository->expects('flexible')->with($hash, [5, 300], Mockery::type('\Closure'))->once();
+        $repository->expects('getMultiple')->never();
 
         $this->mock('cache')->shouldReceive('store')->with(null)->andReturn($repository);
 
@@ -473,14 +473,31 @@ public function test_uses_eloquent_flexible_caching_when_using_ttl_as_array_of_v
 
         $repository = $this->mock(CacheRepository::class);
         $repository->expects('put')->never();
-        $repository->expects('flexible')->with($hash, Mockery::type('array'), [5, 300])->once();
-        $repository->expects('getMultiple')->with([$hash, ''])->times(1)->andReturn(['' => null, $hash => null]);
+        $repository->expects('flexible')->with($hash, [5, 300], Mockery::type('\Closure'))->once();
+        $repository->expects('getMultiple')->never();
 
         $this->mock('cache')->shouldReceive('store')->with(null)->andReturn($repository);
 
         User::where('id', 1)->cache([5, 300])->first();
     }
 
+    public function test_flexible_cache_uses_user_key(): void
+    {
+        $cached = User::query()->cache(key: 'foo', ttl: [5, 300])->with('posts', function ($posts) {
+            $posts->whereKey(2);
+        })->whereKey(1)->first();
+
+        User::query()->whereKey(1)->delete();
+        Post::query()->whereKey(2)->delete();
+
+        $renewed = User::query()->cache(key: 'foo', ttl: [5, 300])->with('posts', function ($posts) {
+            $posts->whereKey(2);
+        })->whereKey(1)->first();
+
+        static::assertTrue($cached->is($renewed));
+        static::assertCount(1, $renewed->posts);
+    }
+
     public function test_doesnt_uses_flexible_caching_if_repository_is_not_flexible(): void
     {
         $hash = 'cache-query|fj8Xyz4K1Zh0tdAamPbG1A';