Merge pull request #76 from TheDragonCode/3.x

Added `Cache::rememberForever` method
TheDragonCode · Nov 14, 2023 · d41405c · d41405c
2 parents 520d096 + 2ec8662
commit d41405c
Show file tree

Hide file tree

Showing 57 changed files with 525 additions and 11 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -40,7 +40,7 @@ jobs:
                 uses: actions/checkout@v4
 
             -   name: Setup Redis
-                uses: zhulik/[email protected]
+                uses: shogo82148/actions-setup-redis@v1
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2

diff --git a/composer.json b/composer.json
@@ -46,7 +46,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "dragon-code/contracts": "^2.16",
+        "dragon-code/contracts": "^2.21",
         "dragon-code/support": "^6.11.3",
         "illuminate/support": ">=6.0 <11.0"
     },

diff --git a/src/Concerns/Call.php b/src/Concerns/Call.php
@@ -8,9 +8,6 @@ trait Call
 {
     use Arrayable;
 
-    /**
-     * @param  mixed  $callback
-     */
     protected function call(mixed $callback = null): mixed
     {
         return $this->isCallable($callback) ? $callback() : $callback;

diff --git a/src/Services/Cache.php b/src/Services/Cache.php
@@ -97,6 +97,11 @@ public function remember(mixed $value): mixed
         return $this->manager()->remember($this->getKey(), $value, $this->ttl);
     }
 
+    public function rememberForever(mixed $value): mixed
+    {
+        return $this->manager()->rememberForever($this->getKey(), $value);
+    }
+
     public function forget(): static
     {
         $this->manager()->forget($this->getKey());

diff --git a/src/Services/Storages/Disabled.php b/src/Services/Storages/Disabled.php
@@ -21,6 +21,11 @@ public function remember(string $key, $value, int $seconds): mixed
         return $this->get($key, $value);
     }
 
+    public function rememberForever(string $key, $value): mixed
+    {
+        return $this->get($key, $value);
+    }
+
     public function forget(string $key): void {}
 
     public function has(string $key): bool

diff --git a/src/Services/Storages/MainStore.php b/src/Services/Storages/MainStore.php
@@ -33,6 +33,13 @@ public function remember(string $key, $value, int $seconds): mixed
         return Cache::remember($key, $seconds, $value);
     }
 
+    public function rememberForever(string $key, $value): mixed
+    {
+        $value = $this->makeCallable($value);
+
+        return Cache::rememberForever($key, $value);
+    }
+
     public function forget(string $key): void
     {
         Cache::forget($key);

diff --git a/src/Services/Storages/TaggedStore.php b/src/Services/Storages/TaggedStore.php
@@ -43,6 +43,13 @@ public function remember(string $key, $value, int $seconds): mixed
         return $this->cache()->remember($key, $seconds, $value);
     }
 
+    public function rememberForever(string $key, $value): mixed
+    {
+        $value = $this->makeCallable($value);
+
+        return $this->cache()->rememberForever($key, $value);
+    }
+
     public function forget(string $key): void
     {
         $this->cache()->forget($key);

diff --git a/src/Support/CacheManager.php b/src/Support/CacheManager.php
@@ -46,6 +46,11 @@ public function remember(string $key, $value, int $seconds): mixed
         return $this->instance()->remember($key, $value, $seconds);
     }
 
+    public function rememberForever(string $key, $value): mixed
+    {
+        return $this->instance()->rememberForever($key, $value);
+    }
+
     public function forget(string $key): void
     {
         $this->instance()->forget($key);

diff --git a/tests/Cache/NotWhen/Arrayables/Many/Arr/DragonCodeTest.php b/tests/Cache/NotWhen/Arrayables/Many/Arr/DragonCodeTest.php
@@ -45,6 +45,15 @@ public function testRemember()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new DragonCodeArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Many/Arr/IlluminateTest.php b/tests/Cache/NotWhen/Arrayables/Many/Arr/IlluminateTest.php
@@ -45,6 +45,15 @@ public function testRemember()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new IlluminateArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Many/Arr/MixedTest.php b/tests/Cache/NotWhen/Arrayables/Many/Arr/MixedTest.php
@@ -49,6 +49,15 @@ public function testRemember()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new MixedArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Many/Files/DragonCodeTest.php b/tests/Cache/NotWhen/Arrayables/Many/Files/DragonCodeTest.php
@@ -47,6 +47,15 @@ public function testRemember()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new DragonCodeArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Many/Files/IlluminateTest.php b/tests/Cache/NotWhen/Arrayables/Many/Files/IlluminateTest.php
@@ -47,6 +47,15 @@ public function testRemember()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new IlluminateArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Many/Files/MixedTest.php b/tests/Cache/NotWhen/Arrayables/Many/Files/MixedTest.php
@@ -51,6 +51,15 @@ public function testRemember()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new MixedArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Many/Redis/DragonCodeTest.php b/tests/Cache/NotWhen/Arrayables/Many/Redis/DragonCodeTest.php
@@ -59,6 +59,19 @@ public function testRemember()
         $this->assertNull($this->cache(['cache'])->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new DragonCodeArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+        $this->assertNull($this->cache(['qwerty', 'cache'])->get());
+
+        $this->assertNull($this->cache(['qwerty'])->get());
+        $this->assertNull($this->cache(['cache'])->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Many/Redis/IlluminateTest.php b/tests/Cache/NotWhen/Arrayables/Many/Redis/IlluminateTest.php
@@ -59,6 +59,19 @@ public function testRemember()
         $this->assertNull($this->cache(['cache'])->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new IlluminateArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+        $this->assertNull($this->cache(['qwerty', 'cache'])->get());
+
+        $this->assertNull($this->cache(['qwerty'])->get());
+        $this->assertNull($this->cache(['cache'])->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Many/Redis/MixedTest.php b/tests/Cache/NotWhen/Arrayables/Many/Redis/MixedTest.php
@@ -63,6 +63,19 @@ public function testRemember()
         $this->assertNull($this->cache(['cache'])->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new MixedArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+        $this->assertNull($this->cache(['qwerty', 'cache'])->get());
+
+        $this->assertNull($this->cache(['qwerty'])->get());
+        $this->assertNull($this->cache(['cache'])->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Simple/Arr/DragonCodeTest.php b/tests/Cache/NotWhen/Arrayables/Simple/Arr/DragonCodeTest.php
@@ -41,6 +41,15 @@ public function testRemember()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new DragonCodeArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Simple/Arr/IlluminateTest.php b/tests/Cache/NotWhen/Arrayables/Simple/Arr/IlluminateTest.php
@@ -41,6 +41,15 @@ public function testRemember()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new IlluminateArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Simple/Files/DragonCodeTest.php b/tests/Cache/NotWhen/Arrayables/Simple/Files/DragonCodeTest.php
@@ -43,6 +43,15 @@ public function testRemember()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new DragonCodeArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Simple/Files/IlluminateTest.php b/tests/Cache/NotWhen/Arrayables/Simple/Files/IlluminateTest.php
@@ -43,6 +43,15 @@ public function testRemember()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new IlluminateArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Simple/Redis/DragonCodeTest.php b/tests/Cache/NotWhen/Arrayables/Simple/Redis/DragonCodeTest.php
@@ -55,6 +55,19 @@ public function testRemember()
         $this->assertNull($this->cache(['cache'])->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new DragonCodeArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+        $this->assertNull($this->cache(['qwerty', 'cache'])->get());
+
+        $this->assertNull($this->cache(['qwerty'])->get());
+        $this->assertNull($this->cache(['cache'])->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Arrayables/Simple/Redis/IlluminateTest.php b/tests/Cache/NotWhen/Arrayables/Simple/Redis/IlluminateTest.php
@@ -55,6 +55,19 @@ public function testRemember()
         $this->assertNull($this->cache(['cache'])->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = new IlluminateArrayable();
+
+        $this->assertSame($item, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+        $this->assertNull($this->cache(['qwerty', 'cache'])->get());
+
+        $this->assertNull($this->cache(['qwerty'])->get());
+        $this->assertNull($this->cache(['cache'])->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Callables/ArrayTest.php b/tests/Cache/NotWhen/Callables/ArrayTest.php
@@ -43,6 +43,17 @@ public function testRemember()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = function () {
+            return $this->value;
+        };
+
+        $this->assertSame($this->value, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());

diff --git a/tests/Cache/NotWhen/Callables/FileTest.php b/tests/Cache/NotWhen/Callables/FileTest.php
@@ -43,6 +43,17 @@ public function testRemember()
         $this->assertNull($this->cache()->get());
     }
 
+    public function testRememberForever()
+    {
+        $item = function () {
+            return $this->value;
+        };
+
+        $this->assertSame($this->value, $this->cache()->rememberForever($item));
+
+        $this->assertNull($this->cache()->get());
+    }
+
     public function testForget()
     {
         $this->assertNull($this->cache()->get());