Merge pull request #10 from TheDragonCode/2.x

[2.x] Added the ability to pass non-callable values

Author: Andrey Helldar

README.md

@@ -39,6 +39,8 @@ use DragonCode\Cache\Services\Cache;
 $cache = Cache::make()->key('foo', 'bar', ['baz', 'baq']);
 
 $cache->put(static fn() => 'Some value');
+// or
+$cache->put('Some value');
 // Contains cached `Some value`
 
 $cache->get();
@@ -63,6 +65,8 @@ $cache = Cache::make()
     ->key('foo', 'bar', ['baz', 'baq']);
 
 $cache->put(static fn() => 'Some value');
+// or
+$cache->put('Some value');
 // Contains cached `Some value`
 
 $cache->get();
@@ -87,6 +91,8 @@ $cache = Cache::make()
     ->key('foo', 'bar', ['baz', 'baq']);
 
 $cache->put(static fn() => 'Some value');
+// or
+$cache->put('Some value');
 // Contains cached `Some value`
 
 $cache->get();
@@ -107,6 +113,8 @@ use DragonCode\Cache\Services\Cache;
 $cache = Cache::make()->key('foo', 'bar');
 
 $cache->tags('actor', 'author')->put(static fn() => 'Some value');
+// or
+$cache->tags('actor', 'author')->put('Some value');
 // Contains cached `Some value`
 
 $cache->tags('actor', 'author')->get();

composer.json

@@ -23,7 +23,7 @@
     },
     "require": {
         "php": "^7.3|^8.0",
-        "dragon-code/contracts": "^2.3.5",
+        "dragon-code/contracts": "^2.5.1",
         "dragon-code/support": "^5.0",
         "illuminate/support": "^6.0|^7.0|^8.0"
     },

src/Concerns/Call.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DragonCode\Cache\Concerns;
+
+trait Call
+{
+    /**
+     * @param  mixed  $callback
+     *
+     * @return mixed
+     */
+    protected function call($callback = null)
+    {
+        return is_callable($callback) ? $callback() : $callback;
+    }
+
+    protected function makeCallable($value): callable
+    {
+        if (! is_callable($value)) {
+            return function () use ($value) {
+                return $value;
+            };
+        }
+
+        return $value;
+    }
+}

src/Services/Cache.php

@@ -4,6 +4,7 @@
 
 namespace DragonCode\Cache\Services;
 
+use DragonCode\Cache\Concerns\Call;
 use DragonCode\Cache\Facades\Support\CacheManager;
 use DragonCode\Cache\Facades\Support\Key;
 use DragonCode\Cache\Facades\Support\Tag;
@@ -15,6 +16,7 @@
  */
 class Cache
 {
+    use Call;
     use Makeable;
 
     protected $ttl = 86400;
@@ -62,13 +64,18 @@ public function get()
         return null;
     }
 
-    public function put(callable $callback)
+    /**
+     * @param  mixed  $value
+     *
+     * @return mixed
+     */
+    public function put($value)
     {
         if ($this->when) {
-            return $this->manager()->put($this->key, $callback, $this->ttl);
+            return $this->manager()->put($this->key, $value, $this->ttl);
         }
 
-        return $callback();
+        return $this->call($value);
     }
 
     public function forget(): void

src/Services/Storages/MainStore.php

@@ -8,7 +8,7 @@
 
 class MainStore extends Store
 {
-    public function get(string $key, callable $default = null)
+    public function get(string $key, $default = null)
     {
         if ($this->has($key)) {
             return Cache::get($key);
@@ -17,9 +17,11 @@ public function get(string $key, callable $default = null)
         return $this->call($default);
     }
 
-    public function put(string $key, callable $callback, int $seconds)
+    public function put(string $key, $value, int $seconds)
     {
-        return Cache::remember($key, $seconds, $callback);
+        $value = $this->makeCallable($value);
+
+        return Cache::remember($key, $seconds, $value);
     }
 
     public function forget(string $key): void

src/Services/Storages/Store.php

@@ -4,20 +4,12 @@
 
 namespace DragonCode\Cache\Services\Storages;
 
+use DragonCode\Cache\Concerns\Call;
 use DragonCode\Contracts\Cache\Store as BaseStore;
 use DragonCode\Support\Concerns\Makeable;
 
 abstract class Store implements BaseStore
 {
+    use Call;
     use Makeable;
-
-    /**
-     * @param  callable|null  $callback
-     *
-     * @return mixed
-     */
-    protected function call(callable $callback = null)
-    {
-        return is_callable($callback) ? $callback() : $callback;
-    }
 }

src/Services/Storages/TaggedStore.php

@@ -18,7 +18,7 @@ public function tags(array $tags): self
         return $this;
     }
 
-    public function get(string $key, callable $default = null)
+    public function get(string $key, $default = null)
     {
         if ($this->has($key)) {
             return $this->cache()->get($key);
@@ -27,9 +27,11 @@ public function get(string $key, callable $default = null)
         return $this->call($default);
     }
 
-    public function put(string $key, callable $callback, int $seconds)
+    public function put(string $key, $value, int $seconds)
     {
-        return $this->cache()->remember($key, $seconds, $callback);
+        $value = $this->makeCallable($value);
+
+        return $this->cache()->remember($key, $seconds, $value);
     }
 
     public function forget(string $key): void

src/Support/CacheManager.php

@@ -20,14 +20,14 @@ public function tags(array $tags): CacheManager
         return $this;
     }
 
-    public function get(string $key, callable $default = null)
+    public function get(string $key, $default = null)
     {
         return $this->instance()->get($key, $default);
     }
 
-    public function put(string $key, callable $callback, int $seconds)
+    public function put(string $key, $value, int $seconds)
     {
-        return $this->instance()->put($key, $callback, $seconds);
+        return $this->instance()->put($key, $value, $seconds);
     }
 
     public function forget(string $key): void

tests/Cache/NotWhen/ArrayTest.php …ts/Cache/NotWhen/Callables/ArrayTest.phptests/Cache/NotWhen/ArrayTest.php renamed to tests/Cache/NotWhen/Callables/ArrayTest.php tests/Cache/NotWhen/ArrayTest.php renamed to tests/Cache/NotWhen/Callables/ArrayTest.php

@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Cache\NotWhen;
+namespace Tests\Cache\NotWhen\Callables;
+
+use Tests\Cache\NotWhen\BaseTest;
 
 class ArrayTest extends BaseTest
 {

tests/Cache/NotWhen/FileTest.php …sts/Cache/NotWhen/Callables/FileTest.phptests/Cache/NotWhen/FileTest.php renamed to tests/Cache/NotWhen/Callables/FileTest.php tests/Cache/NotWhen/FileTest.php renamed to tests/Cache/NotWhen/Callables/FileTest.php

@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Tests\Cache\NotWhen;
+namespace Tests\Cache\NotWhen\Callables;
+
+use Tests\Cache\NotWhen\BaseTest;
 
 class FileTest extends BaseTest
 {