Drop dragon-code/contracts support

composer.json

@@ -34,8 +34,8 @@
     ],
     "require": {
         "php": "^8.0",
-        "dragon-code/contracts": "^2.21",
         "dragon-code/support": "^6.11.3",
+        "illuminate/contracts": "^10.0||^11.0",
         "illuminate/support": ">=6.0 <12.0"
     },
     "require-dev": {

src/Concerns/Arrayable.php

@@ -9,7 +9,6 @@
 use BackedEnum;
 use Carbon\Carbon;
 use Closure;
-use DragonCode\Contracts\Support\Arrayable as DragonCodeArrayable;
 use DragonCode\Support\Facades\Helpers\Arr;
 use DragonCode\Support\Facades\Instances\Instance;
 use DragonCode\Support\Facades\Instances\Reflection;
@@ -97,12 +96,10 @@ protected function isArrayable($value): bool
 
         if (
             Instance::of($value, [
-                DragonCodeArrayable::class,
-                IlluminateArrayable::class,
                 ArrayableHelper::class,
+                IlluminateArrayable::class,
                 ArrayObject::class,
                 ArrayAccess::class,
-                DragonCodeArrayable::class,
             ])
         ) {
             return true;

src/Concerns/Has.php

@@ -7,7 +7,6 @@
 use Carbon\Carbon;
 use Closure;
 use DateTimeInterface;
-use DragonCode\Contracts\Cache\Ttl;
 use DragonCode\Support\Facades\Instances\Instance;
 use DragonCode\Support\Facades\Types\Is;
 
@@ -27,9 +26,4 @@ protected function hasObject($value): bool
     {
         return Is::object($value);
     }
-
-    protected function hasContract($value): bool
-    {
-        return Instance::of($value, Ttl::class);
-    }
 }

src/Facades/Support/Key.php

@@ -6,12 +6,12 @@
 
 use ArrayObject;
 use DragonCode\Cache\Support\Key as Support;
-use DragonCode\Contracts\DataTransferObject\DataTransferObject;
-use DragonCode\Contracts\Support\Arrayable;
+use DragonCode\SimpleDataTransferObject\DataTransferObject;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @method static string get(string $separator, array|Arrayable|\Illuminate\Contracts\Support\Arrayable|ArrayObject|DataTransferObject $values, bool $hash = true)
+ * @method static string get(string $separator, array|Arrayable|ArrayObject|DataTransferObject $values, bool $hash = true)
  */
 class Key extends Facade
 {

src/Facades/Support/Tag.php

@@ -5,12 +5,12 @@
 namespace DragonCode\Cache\Facades\Support;
 
 use DragonCode\Cache\Support\Tag as Support;
-use DragonCode\Contracts\DataTransferObject\DataTransferObject;
-use DragonCode\Contracts\Support\Arrayable;
+use DragonCode\SimpleDataTransferObject\DataTransferObject;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @method static array get(array|Arrayable|\Illuminate\Contracts\Support\Arrayable|\ArrayObject|DataTransferObject $tags)
+ * @method static array get(array|Arrayable|\ArrayObject|DataTransferObject $tags)
  */
 class Tag extends Facade
 {

src/Services/Storages/Store.php

@@ -5,10 +5,9 @@
 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
+abstract class Store
 {
     use Call;
     use Makeable;

src/Support/CacheManager.php

@@ -6,15 +6,15 @@
 
 use DragonCode\Cache\Services\Storages\Disabled;
 use DragonCode\Cache\Services\Storages\MainStore;
+use DragonCode\Cache\Services\Storages\Store;
 use DragonCode\Cache\Services\Storages\TaggedStore;
-use DragonCode\Contracts\Cache\Store;
 use DragonCode\Support\Concerns\Makeable;
 use Illuminate\Support\Facades\Cache;
 
 /**
  * @method static CacheManager make(bool $when = true)
  */
-class CacheManager implements Store
+class CacheManager extends Store
 {
     use Makeable;
 
@@ -61,11 +61,6 @@ public function has(string $key): bool
         return $this->instance()->has($key);
     }
 
-    public function doesntHave(string $key): bool
-    {
-        return ! $this->has($key);
-    }
-
     public function flush(): void
     {
         $this->instance()->flush();

src/Support/Key.php

@@ -6,7 +6,6 @@
 
 use ArrayObject;
 use DragonCode\Cache\Concerns\Arrayable;
-use DragonCode\Contracts\Support\Arrayable as DragonArrayable;
 use Illuminate\Contracts\Support\Arrayable as IlluminateArrayable;
 
 class Key
@@ -15,7 +14,7 @@ class Key
 
     public function get(
         string $separator,
-        array|ArrayObject|DragonArrayable|IlluminateArrayable $values,
+        array|ArrayObject|IlluminateArrayable $values,
         bool $hash = true
     ): string {
         $values = $this->toArray($values);

src/Support/Tag.php

@@ -6,15 +6,15 @@
 
 use ArrayObject;
 use DragonCode\Cache\Concerns\Arrayable;
-use DragonCode\Contracts\DataTransferObject\DataTransferObject;
+use DragonCode\SimpleDataTransferObject\DataTransferObject;
 use DragonCode\Support\Facades\Helpers\Str;
 
 class Tag
 {
     use Arrayable;
 
     /**
-     * @param  array|\DragonCode\Contracts\Support\Arrayable|\Illuminate\Contracts\Support\Arrayable|ArrayObject|DataTransferObject  $tags
+     * @param  array|\Illuminate\Contracts\Support\Arrayable|ArrayObject|DataTransferObject  $tags
      */
     public function get(mixed $tags): array
     {

src/Support/Ttl.php

@@ -39,10 +39,6 @@ public function fromDateTime(DateTimeInterface $date_time): int
 
     protected function get($value, int $multiplier = 1): int
     {
-        if ($this->hasObject($value) && $this->hasContract($value)) {
-            $value = $value->cacheTtl();
-        }
-
         if ($this->hasDateTime($value)) {
             return $this->fromDateTime($value);
         }

tests/Fixtures/Concerns/Dtoable.php

@@ -4,7 +4,7 @@
 
 namespace Tests\Fixtures\Concerns;
 
-use DragonCode\Contracts\DataTransferObject\DataTransferObject;
+use DragonCode\SimpleDataTransferObject\DataTransferObject;
 use Tests\Fixtures\Dto\DtoObject;
 
 trait Dtoable

tests/Fixtures/Many/DragonCodeArrayable.php

@@ -4,7 +4,7 @@
 
 namespace Tests\Fixtures\Many;
 
-use DragonCode\Contracts\Support\Arrayable;
+use Illuminate\Contracts\Support\Arrayable;
 use Tests\Fixtures\Simple\DragonCodeArrayable as Simple;
 
 class DragonCodeArrayable implements Arrayable

tests/Fixtures/Many/MixedArrayable.php

@@ -4,7 +4,7 @@
 
 namespace Tests\Fixtures\Many;
 
-use DragonCode\Contracts\Support\Arrayable;
+use Illuminate\Contracts\Support\Arrayable;
 use Tests\Fixtures\Simple\DragonCodeArrayable as SimpleDragon;
 use Tests\Fixtures\Simple\IlluminateArrayable as SimpleIlluminate;
 

tests/Fixtures/Simple/DragonCodeArrayable.php

@@ -4,7 +4,7 @@
 
 namespace Tests\Fixtures\Simple;
 
-use DragonCode\Contracts\Support\Arrayable;
+use Illuminate\Contracts\Support\Arrayable;
 
 class DragonCodeArrayable implements Arrayable
 {

tests/Fixtures/Ttl/AsCarbon.php

@@ -5,16 +5,12 @@
 namespace Tests\Fixtures\Ttl;
 
 use Carbon\Carbon;
-use DragonCode\Contracts\Cache\Ttl;
 
-class AsCarbon implements Ttl
+class AsCarbon
 {
-    protected $value;
-
-    public function __construct(string $value)
-    {
-        $this->value = $value;
-    }
+    public function __construct(
+        protected string $value
+    ) {}
 
     public function cacheTtl(): Carbon
     {

tests/Fixtures/Ttl/AsDateTime.php

@@ -6,9 +6,8 @@
 
 use DateTime;
 use DateTimeInterface;
-use DragonCode\Contracts\Cache\Ttl;
 
-class AsDateTime implements Ttl
+class AsDateTime
 {
     public function __construct(
         protected string $value

tests/Fixtures/Ttl/AsInteger.php

@@ -4,16 +4,11 @@
 
 namespace Tests\Fixtures\Ttl;
 
-use DragonCode\Contracts\Cache\Ttl;
-
-class AsInteger implements Ttl
+class AsInteger
 {
-    protected $value;
-
-    public function __construct(string $value)
-    {
-        $this->value = $value;
-    }
+    public function __construct(
+        protected string $value
+    ) {}
 
     public function cacheTtl(): int
     {

tests/Fixtures/Ttl/AsString.php

@@ -4,16 +4,11 @@
 
 namespace Tests\Fixtures\Ttl;
 
-use DragonCode\Contracts\Cache\Ttl;
-
-class AsString implements Ttl
+class AsString
 {
-    protected $value;
-
-    public function __construct(string $value)
-    {
-        $this->value = $value;
-    }
+    public function __construct(
+        protected string $value
+    ) {}
 
     public function cacheTtl(): string
     {