Merge pull request #6 from rennokki/feature/flush-tags-does-not-work-properly

[feature] Flush each tag on flush cache

Author: rennokki

README.md

@@ -77,6 +77,9 @@ $shelfTwoBooks = Book::whereShelf(2)->cacheFor(60)->cacheTags(['shelf:2'])->get(
 
 // After flushing the cache for shelf:1, the query of$shelfTwoBooks will still hit the cache if re-called again.
 Book::flushQueryCache(['shelf:1']);
+
+// Flushing also works for both tags, invalidating them both, not just the one tagged with shelf:1
+Book::flushQueryCache(['shelf:1', 'shelf:2']);
 ```
 
 Be careful tho - specifying cache tags does not change the behaviour of key storage.

src/Query/Builder.php

@@ -19,9 +19,9 @@ class Builder extends BaseBuilder
      * The tags for the query cache. Can be useful
      * if flushing cache for specific tags only.
      *
-     * @var array
+     * @var null|array
      */
-    protected $cacheTags = [];
+    protected $cacheTags = null;
 
     /**
      * The cache driver to be used.
@@ -159,21 +159,41 @@ public function generatePlainCacheKey(string $method = 'get', $id = null, $appen
     }
 
     /**
-     * Flush the cache for the current model or
-     * flush cache containing specific tags.
+     * Flush the cache that contains specific tags.
      *
      * @param  array  $tags
      * @return bool
      */
-    public function flushQueryCache(array $tags = ['leqc']): bool
+    public function flushQueryCache(array $tags = []): bool
     {
         $cache = $this->getCacheDriver();
 
         if (! method_exists($cache, 'tags')) {
             return false;
         }
 
-        return $cache->tags($tags ?: $this->cacheTags)->flush();
+        foreach ($tags as $tag) {
+            self::flushQueryCacheWithTag($tag);
+        }
+
+        return true;
+    }
+
+    /**
+     * Flush the cache for a specific tag.
+     *
+     * @param  string  $tag
+     * @return bool
+     */
+    public function flushQueryCacheWithTag(string $tag): bool
+    {
+        $cache = $this->getCacheDriver();
+
+        if (! method_exists($cache, 'tags')) {
+            return false;
+        }
+
+        return $cache->tags($tag)->flush();
     }
 
     /**

tests/MethodsTest.php

@@ -65,11 +65,30 @@ public function test_cache_flush_without_the_right_tag()
         $this->assertNotNull($cache);
 
         Post::flushQueryCache(['test2']);
+        Post::flushQueryCacheWithTag('test2');
 
         $cache = Cache::tags(['test'])->get('leqc:sqlitegetselect * from "posts" limit 1a:0:{}');
         $this->assertNotNull($cache);
     }
 
+    public function test_cache_flush_with_more_tags()
+    {
+        $post = factory(Post::class)->create();
+        $storedPost = Post::cacheFor(now()->addHours(1))->cacheTags(['test'])->first();
+
+        $cache = Cache::tags(['test'])->get('leqc:sqlitegetselect * from "posts" limit 1a:0:{}');
+        $this->assertNotNull($cache);
+
+        Post::flushQueryCache([
+            'test',
+            'test2',
+            'test3',
+        ]);
+
+        $cache = Cache::tags(['test'])->get('leqc:sqlitegetselect * from "posts" limit 1a:0:{}');
+        $this->assertNull($cache);
+    }
+
     public function test_hashed_key()
     {
         $kid = factory(Kid::class)->create();