Merge pull request #96 from TheDragonCode/4.x

Optimized the appeal to the functions

Author: andrey-helldar

src/Concerns/Arrayable.php

@@ -16,6 +16,15 @@
 use Illuminate\Contracts\Support\Arrayable as IlluminateArrayable;
 use Illuminate\Foundation\Http\FormRequest;
 
+use function array_merge;
+use function get_class;
+use function is_array;
+use function is_bool;
+use function is_numeric;
+use function is_object;
+use function is_string;
+use function method_exists;
+
 trait Arrayable
 {
     protected function arrayMap(array $values, callable $callback): array
@@ -44,7 +53,7 @@ protected function arrayFlattenKeysMap(array $values, callable $callback): array
         return Arr::of($values)
             ->flattenKeys()
             ->filter(static fn ($value) => ! empty($value) || is_numeric($value) || is_bool($value))
-            ->map(fn (mixed $value, mixed $key) => $callback($key . '=' . $value))
+            ->map(static fn (mixed $value, mixed $key) => $callback($key . '=' . $value))
             ->toArray();
     }
 
@@ -72,10 +81,12 @@ protected function flattenKeys(mixed $array, string $delimiter = '.', ?string $p
     protected function toArray($value): array
     {
         return Arr::of(Arr::wrap($value))
-            ->map(fn ($value) => Instance::of($value, Carbon::class) ? $value->toIso8601String() : $value)
-            ->map(fn ($value) => Instance::of($value, FormRequest::class) ? $value->validated() : $value)
-            ->map(fn ($value) => Instance::of($value, BackedEnum::class) ? ($value->value ?? $value->name) : $value)
-            ->map(fn ($value) => is_object($value) ? (Arr::resolve($value) ?: get_class($value)) : $value)
+            ->map(static fn ($value) => Instance::of($value, Carbon::class) ? $value->toIso8601String() : $value)
+            ->map(static fn ($value) => Instance::of($value, FormRequest::class) ? $value->validated() : $value)
+            ->map(
+                static fn ($value) => Instance::of($value, BackedEnum::class) ? ($value->value ?? $value->name) : $value
+            )
+            ->map(static fn ($value) => is_object($value) ? (Arr::resolve($value) ?: get_class($value)) : $value)
             ->resolve()
             ->toArray();
     }

src/Concerns/Call.php

@@ -4,29 +4,26 @@
 
 namespace DragonCode\Cache\Concerns;
 
+use function function_exists;
+use function is_callable;
+use function is_string;
+
 trait Call
 {
     use Arrayable;
 
     protected function call(mixed $callback = null): mixed
     {
-        return $this->isCallable($callback) && ! $this->isFunction($callback) ? $callback() : $callback;
+        return is_callable($callback) && ! $this->isFunction($callback) ? $callback() : $callback;
     }
 
     protected function makeCallable($value): callable
     {
-        if ($this->isCallable($value) && ! $this->isFunction($value)) {
+        if (is_callable($value) && ! $this->isFunction($value)) {
             return $value;
         }
 
-        return function () use ($value) {
-            return $value;
-        };
-    }
-
-    protected function isCallable($value): bool
-    {
-        return is_callable($value);
+        return static fn () => $value;
     }
 
     protected function isFunction($value): bool

src/ServiceProvider.php

@@ -16,7 +16,7 @@ public function boot(): void
     protected function bootConfig(): void
     {
         $this->publishes([
-            __DIR__ . '/../config/cache.php' => config_path('cache.php'),
+            __DIR__ . '/../config/cache.php' => $this->app->configPath('cache.php'),
         ], 'config');
     }
 }

src/Services/Cache.php

@@ -13,6 +13,12 @@
 use DragonCode\Support\Facades\Instances\Call;
 use Illuminate\Support\Facades\Auth;
 
+use function array_unshift;
+use function config;
+use function get_class;
+use function is_object;
+use function is_string;
+
 /**
  * @method static Cache make()
  */

src/Support/CacheManager.php

@@ -11,6 +11,8 @@
 use DragonCode\Support\Concerns\Makeable;
 use Illuminate\Support\Facades\Cache;
 
+use function method_exists;
+
 /**
  * @method static CacheManager make(bool $when = true)
  */

src/Support/Key.php

@@ -8,6 +8,9 @@
 use DragonCode\Cache\Concerns\Arrayable;
 use Illuminate\Contracts\Support\Arrayable as IlluminateArrayable;
 
+use function hash;
+use function implode;
+
 class Key
 {
     use Arrayable;
@@ -21,16 +24,11 @@ public function get(
 
         $hashed = $this->hash($values, $hash);
 
-        return $this->compile($hashed, $separator);
+        return implode($separator, $hashed);
     }
 
     protected function hash(array $values, bool $hash = true): array
     {
-        return $this->arrayFlattenKeysMap($values, fn (mixed $value) => $hash ? hash('xxh128', $value) : $value);
-    }
-
-    protected function compile(array $values, string $separator): string
-    {
-        return implode($separator, $values);
+        return $this->arrayFlattenKeysMap($values, static fn (mixed $value) => $hash ? hash('xxh128', $value) : $value);
     }
 }

src/Support/Tag.php

@@ -17,9 +17,9 @@ class Tag
      */
     public function get(mixed $tags): array
     {
-        $tags = $this->toArray($tags);
-
-        return $this->map($tags);
+        return $this->map(
+            $this->toArray($tags)
+        );
     }
 
     protected function map(array $tags): array

src/Support/Ttl.php

@@ -9,12 +9,18 @@
 use DragonCode\Cache\Concerns\Call;
 use DragonCode\Cache\Concerns\Has;
 
+use function abs;
+use function config;
+use function get_class;
+
 class Ttl
 {
     use Call;
     use Has;
 
-    public const DAY   = 60 * 24;
+    /** @deprecated  */
+    public const DAY = 60 * 24;
+
     public const MONTH = 60 * 24 * 30;
     public const WEEK  = 60 * 24 * 7;