Merge pull request #47 from TheDragonCode/3.x

Bump `dragon-code/support` 6 and PHP 8.0+ support

.github/workflows/laravel-6.yml

@@ -9,7 +9,7 @@ jobs:
             fail-fast: true
             matrix:
                 laravel: [ "6.0" ]
-                php: [ "7.3", "7.4", "8.0" ]
+                php: [ "8.0" ]
 
         name: PHP ${{ matrix.php }}
 

.github/workflows/laravel-7.yml

@@ -9,7 +9,7 @@ jobs:
             fail-fast: true
             matrix:
                 laravel: [ "7.0" ]
-                php: [ "7.3", "7.4", "8.0" ]
+                php: [ "8.0" ]
 
         name: PHP ${{ matrix.php }}
 

.github/workflows/laravel-8.yml

@@ -9,7 +9,7 @@ jobs:
             fail-fast: true
             matrix:
                 laravel: [ "8.0" ]
-                php: [ "7.3", "7.4", "8.0", "8.1" ]
+                php: [ "8.0", "8.1" ]
 
         name: PHP ${{ matrix.php }}
 

.github/workflows/lint-check.yml

@@ -11,4 +11,4 @@ jobs:
                 uses: actions/checkout@v3
 
             -   name: Checking PHP Syntax
-                uses: TheDragonCode/codestyler@v1.13.1
+                uses: TheDragonCode/codestyler@v2.0.0

.github/workflows/lint-fixer.yml

@@ -13,7 +13,7 @@ jobs:
                 uses: actions/checkout@v3
 
             -   name: Checking PHP Syntax
-                uses: TheDragonCode/codestyler@v1.13.1
+                uses: TheDragonCode/codestyler@v2.0.0
                 with:
                     github_token: ${{ secrets.COMPOSER_TOKEN }}
                     fix: true

README.md

@@ -20,7 +20,7 @@ Or manually update `require` block of `composer.json` and run `composer update`.
 ```json
 {
     "require": {
-        "dragon-code/laravel-cache": "^2.12"
+        "dragon-code/laravel-cache": "^3.0"
     }
 }
 ```

composer.json

@@ -22,13 +22,13 @@
         "source": "https://github.com/TheDragonCode/laravel-cache"
     },
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": " ^8.0",
         "dragon-code/contracts": "^2.16",
-        "dragon-code/support": "^5.7.2",
+        "dragon-code/support": " ^6.1",
         "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0"
     },
     "require-dev": {
-        "dragon-code/simple-dto": "^2.1",
+        "dragon-code/simple-dto": "^2.3",
         "orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0",
         "phpunit/phpunit": "^8.5 || ^9.0"
     },

src/Concerns/Arrayable.php

@@ -8,21 +8,20 @@
 use ArrayObject;
 use Closure;
 use DragonCode\Contracts\Support\Arrayable as DragonCodeArrayable;
-use DragonCode\Support\Facades\Helpers\Ables\Arrayable as Helper;
 use DragonCode\Support\Facades\Helpers\Arr;
-use DragonCode\Support\Facades\Helpers\Instance;
-use DragonCode\Support\Facades\Helpers\Reflection;
+use DragonCode\Support\Facades\Instances\Instance;
+use DragonCode\Support\Facades\Instances\Reflection;
 use DragonCode\Support\Helpers\Ables\Arrayable as ArrayableHelper;
 use Illuminate\Contracts\Support\Arrayable as IlluminateArrayable;
 
 trait Arrayable
 {
     protected function arrayMap(array $values, callable $callback): array
     {
-        return Helper::of($values)
+        return Arr::of($values)
             ->map(function ($value) {
                 if ($this->isArrayable($value)) {
-                    return Arr::toArray($value);
+                    return $this->toArray($value);
                 }
 
                 if (is_object($value)) {
@@ -32,17 +31,15 @@ protected function arrayMap(array $values, callable $callback): array
                 return $value;
             })
             ->flatten()
-            ->filter(static function ($value) {
-                return ! empty($value) || is_numeric($value);
-            })
+            ->filter(static fn ($value) => ! empty($value) || is_numeric($value))
             ->map($callback)
             ->values()
-            ->get();
+            ->toArray();
     }
 
     protected function toArray($value): array
     {
-        return Arr::toArray($value);
+        return Arr::resolve($value);
     }
 
     protected function isArrayable($value): bool

src/Concerns/Has.php

@@ -7,9 +7,9 @@
 use Carbon\Carbon;
 use Closure;
 use DateTimeInterface;
-use DragonCode\Contracts\Cache\Ttl as TtlContract;
-use DragonCode\Support\Facades\Helpers\Instance;
-use DragonCode\Support\Facades\Helpers\Is;
+use DragonCode\Contracts\Cache\Ttl;
+use DragonCode\Support\Facades\Instances\Instance;
+use DragonCode\Support\Facades\Types\Is;
 
 trait Has
 {
@@ -30,6 +30,6 @@ protected function hasObject($value): bool
 
     protected function hasContract($value): bool
     {
-        return Instance::of($value, TtlContract::class);
+        return Instance::of($value, Ttl::class);
     }
 }

src/Support/Tag.php

@@ -7,7 +7,7 @@
 use ArrayObject;
 use DragonCode\Cache\Concerns\Arrayable;
 use DragonCode\Contracts\DataTransferObject\DataTransferObject;
-use DragonCode\Support\Facades\Helpers\Ables\Stringable;
+use DragonCode\Support\Facades\Helpers\Str;
 
 class Tag
 {
@@ -18,7 +18,7 @@ class Tag
      *
      * @return array
      */
-    public function get($tags): array
+    public function get(mixed $tags): array
     {
         $tags = $this->toArray($tags);
 
@@ -27,13 +27,11 @@ public function get($tags): array
 
     protected function map(array $tags): array
     {
-        return $this->arrayMap($tags, function (string $tag) {
-            return $this->slug($tag);
-        });
+        return $this->arrayMap($tags, fn (string $tag) => $this->slug($tag));
     }
 
     protected function slug(string $tag): string
     {
-        return (string) Stringable::of($tag)->trim()->slug();
+        return Str::of($tag)->trim()->slug()->toString();
     }
 }

src/Support/Ttl.php

@@ -14,7 +14,7 @@ class Ttl
     use Call;
     use Has;
 
-    protected $default = 3600;
+    protected int $default = 3600;
 
     public function fromMinutes($minutes): int
     {
@@ -28,7 +28,7 @@ public function fromSeconds($seconds): int
 
     public function fromDateTime(DateTimeInterface $date_time): int
     {
-        $seconds = Carbon::now()->diffInRealSeconds($date_time, false);
+        $seconds = Carbon::now()->diffInRealSeconds($date_time);
 
         return $this->correct($seconds);
     }

tests/Fixtures/Ttl/AsDateTime.php

@@ -10,11 +10,9 @@
 
 class AsDateTime implements Ttl
 {
-    protected $value;
-
-    public function __construct(string $value)
-    {
-        $this->value = $value;
+    public function __construct(
+        protected string $value
+    ) {
     }
 
     public function cacheTtl(): DateTimeInterface