Small refactoring

Author: andrey-helldar

src/Concerns/Call.php

@@ -17,7 +17,7 @@ protected function call(mixed $callback = null): mixed
         return is_callable($callback) && ! $this->isFunction($callback) ? $callback() : $callback;
     }
 
-    protected function makeCallable($value): callable
+    protected function makeCallable(mixed $value): callable
     {
         if (is_callable($value) && ! $this->isFunction($value)) {
             return $value;

src/Services/Cache.php

@@ -109,11 +109,19 @@ public function key(...$values): Cache
      * Cache::flexible('some', [300 - 60, 300], fn () => ...)
      * ```
      *
+     * If you specify 0, then 15% of the remaining time will be taken as the interval.
+     * For example,
+     * ```
+     * Cache::flexible('some', [(300 - 15% = 255), 300], fn () => ...)
+     * ```
+     *
+     * By default, `0`.
+     *
      * @see https://laravel.com/docs/12.x/cache#swr
      *
      * @return $this
      */
-    public function flexible(int $interval, bool $isMinutes = true): Cache
+    public function flexible(int $interval = 0, bool $isMinutes = true): Cache
     {
         $this->ttlInterval = $isMinutes ? $interval * 60 : $interval;
 

src/Services/Storages/TaggedStore.php

@@ -20,11 +20,8 @@ public function tags(array $tags): self
 
     public function get(string $key, $default = null): mixed
     {
-        if ($this->has($key)) {
-            return $this->cache()->get($key);
-        }
-
-        return $this->call($default);
+        return $this->cache()->get($key)
+            ?? $this->call($default);
     }
 
     public function put(string $key, $value, int $seconds): mixed
@@ -38,23 +35,17 @@ public function put(string $key, $value, int $seconds): mixed
 
     public function flexible(string $key, $value, int $seconds, int $interval): mixed
     {
-        $value = $this->makeCallable($value);
-
-        return Cache::flexible($key, [$seconds, $interval], $value);
+        return $this->cache()->flexible($key, [$interval, $seconds], $this->makeCallable($value));
     }
 
     public function remember(string $key, $value, int $seconds): mixed
     {
-        $value = $this->makeCallable($value);
-
-        return $this->cache()->remember($key, $seconds, $value);
+        return $this->cache()->remember($key, $seconds, $this->makeCallable($value));
     }
 
     public function rememberForever(string $key, $value): mixed
     {
-        $value = $this->makeCallable($value);
-
-        return $this->cache()->rememberForever($key, $value);
+        return $this->cache()->rememberForever($key, $this->makeCallable($value));
     }
 
     public function forget(string $key): void

src/Support/CacheManager.php

@@ -48,6 +48,9 @@ public function flexible(string $key, $value, int $seconds, int $interval): mixe
         if ($interval < 0) {
             $interval = $seconds - $interval;
         }
+        elseif ($interval === 0) {
+            $interval = (int) (300 * 0.85);
+        }
 
         return $this->instance()->flexible($key, $value, $seconds, $interval);
     }