Added the ability to work with tags without keys

TheDragonCode · Jan 15, 2024 · 4646632 · 4646632
1 parent 3eea010
commit 4646632
Show file tree

Hide file tree

Showing 12 changed files with 139 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Or manually update `require` block of `composer.json` and run `composer update`.
 ```json
 {
     "require": {
-        "dragon-code/laravel-cache": "^3.9"
+        "dragon-code/laravel-cache": "^3.11"
     }
 }
 ```
@@ -201,6 +201,9 @@ $cache->doesntHave();
 
 $cache->forget();
 // Will remove the key from the cache.
+
+$cache->flush();
+// Clears keys or tags by value
 ```
 
 ```php
@@ -237,6 +240,9 @@ $cache->doesntHave();
 
 $cache->forget();
 // Will remove the key from the cache.
+
+$cache->flush();
+// Clears keys or tags by value
 ```
 
 #### Method Call Chain
@@ -428,6 +434,9 @@ $cache->doesntHave();
 
 $cache->forget();
 // Will remove the key from the cache.
+
+$cache->flush();
+// Clears keys or tags by value
 ```
 
 To retrieve a tagged cache item, pass the same ordered list of tags to the tags method and then call the get method with
@@ -451,6 +460,9 @@ $cache->tags('actor')->get();
 
 $cache->tags('author')->get();
 // Returns `null`
+
+$cache->tags('author')->flush();
+// Clears keys or tags by value
 ```
 
 > See the official Laravel [documentation](https://laravel.com/docs/cache#accessing-tagged-cache-items).

diff --git a/src/Services/Cache.php b/src/Services/Cache.php
@@ -109,6 +109,13 @@ public function forget(): static
         return $this;
     }
 
+    public function flush(): static
+    {
+        $this->manager()->flush();
+
+        return $this;
+    }
+
     public function has(): bool
     {
         return $this->manager()->has($this->getKey());

diff --git a/src/Services/Storages/Disabled.php b/src/Services/Storages/Disabled.php
@@ -32,4 +32,6 @@ public function has(string $key): bool
     {
         return false;
     }
+
+    public function flush(): void {}
 }
diff --git a/src/Services/Storages/MainStore.php b/src/Services/Storages/MainStore.php
@@ -49,4 +49,9 @@ public function has(string $key): bool
     {
         return Cache::has($key);
     }
+
+    public function flush(): void
+    {
+        Cache::flush();
+    }
 }
diff --git a/src/Services/Storages/TaggedStore.php b/src/Services/Storages/TaggedStore.php
@@ -60,6 +60,11 @@ public function has(string $key): bool
         return $this->cache()->has($key);
     }
 
+    public function flush(): void
+    {
+        $this->cache()->flush();
+    }
+
     protected function cache(): TaggedCache
     {
         return Cache::tags($this->tags);

diff --git a/src/Support/CacheManager.php b/src/Support/CacheManager.php
@@ -66,6 +66,11 @@ public function doesntHave(string $key): bool
         return ! $this->has($key);
     }
 
+    public function flush(): void
+    {
+        $this->instance()->flush();
+    }
+
     protected function instance(): Store
     {
         return match (true) {

diff --git a/tests/Cache/NotWhen/Simple/ArrayTest.php b/tests/Cache/NotWhen/Simple/ArrayTest.php
@@ -4,6 +4,7 @@
 
 namespace Tests\Cache\NotWhen\Simple;
 
+use DragonCode\Cache\Services\Cache;
 use Tests\Cache\NotWhen\Base;
 
 class ArrayTest extends Base
@@ -51,6 +52,22 @@ public function testForget()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testFlush()
+    {
+        $tags  = Cache::make()->tags('foo', 'bar');
+        $cache = (clone $tags)->key('qwerty');
+
+        $this->assertNull($cache->get());
+
+        $cache->put('asd');
+
+        $this->assertSame('asd', $cache->get());
+
+        $tags->flush();
+
+        $this->assertNull($cache->get());
+    }
+
     public function testHas()
     {
         $this->assertFalse($this->cache()->has());

diff --git a/tests/Cache/NotWhen/Simple/FileTest.php b/tests/Cache/NotWhen/Simple/FileTest.php
@@ -4,6 +4,7 @@
 
 namespace Tests\Cache\NotWhen\Simple;
 
+use DragonCode\Cache\Services\Cache;
 use Tests\Cache\NotWhen\Base;
 
 class FileTest extends Base
@@ -51,6 +52,22 @@ public function testForget()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testFlush()
+    {
+        $tags  = Cache::make()->tags('foo', 'bar');
+        $cache = (clone $tags)->key('qwerty');
+
+        $this->assertNull($cache->get());
+
+        $cache->put('asd');
+
+        $this->assertSame('asd', $cache->get());
+
+        $tags->flush();
+
+        $this->assertNull($cache->get());
+    }
+
     public function testHas()
     {
         $this->assertFalse($this->cache()->has());

diff --git a/tests/Cache/NotWhen/Simple/RedisTest.php b/tests/Cache/NotWhen/Simple/RedisTest.php
@@ -4,6 +4,7 @@
 
 namespace Tests\Cache\NotWhen\Simple;
 
+use DragonCode\Cache\Services\Cache;
 use Illuminate\Support\Facades\Auth;
 use Tests\Cache\NotWhen\Base;
 use Tests\Fixtures\Models\User;
@@ -73,6 +74,22 @@ public function testForget()
         $this->assertNull($this->cache(['cache'])->get());
     }
 
+    public function testFlush()
+    {
+        $tags  = Cache::make()->tags('foo', 'bar');
+        $cache = (clone $tags)->key('qwerty');
+
+        $this->assertNull($cache->get());
+
+        $cache->put('asd');
+
+        $this->assertSame('asd', $cache->get());
+
+        $tags->flush();
+
+        $this->assertNull($cache->get());
+    }
+
     public function testHas()
     {
         $this->assertFalse($this->cache()->has());

diff --git a/tests/Cache/When/Simple/ArrayTest.php b/tests/Cache/When/Simple/ArrayTest.php
@@ -4,6 +4,7 @@
 
 namespace Tests\Cache\When\Simple;
 
+use DragonCode\Cache\Services\Cache;
 use Tests\Cache\When\Base;
 
 class ArrayTest extends Base
@@ -61,6 +62,22 @@ public function testForget()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testFlush()
+    {
+        $tags  = Cache::make()->tags('foo', 'bar');
+        $cache = (clone $tags)->key('qwerty');
+
+        $this->assertNull($cache->get());
+
+        $cache->put('asd');
+
+        $this->assertSame('asd', $cache->get());
+
+        $tags->flush();
+
+        $this->assertNull($cache->get());
+    }
+
     public function testHas()
     {
         $this->assertFalse($this->cache()->has());

diff --git a/tests/Cache/When/Simple/FileTest.php b/tests/Cache/When/Simple/FileTest.php
@@ -4,6 +4,7 @@
 
 namespace Tests\Cache\When\Simple;
 
+use DragonCode\Cache\Services\Cache;
 use Tests\Cache\When\Base;
 
 class FileTest extends Base
@@ -63,6 +64,22 @@ public function testForget()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testFlush()
+    {
+        $tags  = Cache::make()->tags('foo', 'bar');
+        $cache = (clone $tags)->key('qwerty');
+
+        $this->assertNull($cache->get());
+
+        $cache->put('asd');
+
+        $this->assertSame('asd', $cache->get());
+
+        $tags->flush();
+
+        $this->assertNull($cache->get());
+    }
+
     public function testHas()
     {
         $this->assertFalse($this->cache()->has());

diff --git a/tests/Cache/When/Simple/RedisTest.php b/tests/Cache/When/Simple/RedisTest.php
@@ -4,6 +4,7 @@
 
 namespace Tests\Cache\When\Simple;
 
+use DragonCode\Cache\Services\Cache;
 use Illuminate\Support\Facades\Auth;
 use Tests\Cache\When\Base;
 use Tests\Fixtures\Models\User;
@@ -72,6 +73,22 @@ public function testForget()
         $this->assertNull($this->cache(['cache'])->get());
     }
 
+    public function testFlush()
+    {
+        $tags  = Cache::make()->tags('foo', 'bar');
+        $cache = (clone $tags)->key('qwerty');
+
+        $this->assertNull($cache->get());
+
+        $cache->put('asd');
+
+        $this->assertSame('asd', $cache->get());
+
+        $tags->flush();
+
+        $this->assertNull($cache->get());
+    }
+
     public function testHas()
     {
         $this->assertFalse($this->cache()->has());