Remove Dependencies

src/Contracts/FeatureConsumptionContract.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace LucasDotVin\Soulbscription\Contracts;
+
+/**
+ * @mixin \Illuminate\Database\Eloquent\Model
+ */
+interface FeatureConsumptionContract
+{
+    //
+}

src/Contracts/FeatureContract.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace LucasDotVin\Soulbscription\Contracts;
+
+/**
+ * @mixin \Illuminate\Database\Eloquent\Model
+ */
+interface FeatureContract
+{
+    //
+}

src/Contracts/FeatureTicketContract.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace LucasDotVin\Soulbscription\Contracts;
+
+/**
+ * @mixin \Illuminate\Database\Eloquent\Model
+ */
+interface FeatureTicketContract
+{
+    //
+}

src/Contracts/PlanContract.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace LucasDotVin\Soulbscription\Contracts;
+
+use Illuminate\Support\Carbon;
+
+/**
+ * @mixin \Illuminate\Database\Eloquent\Model
+ */
+interface PlanContract
+{
+    public function calculateNextRecurrenceEnd(Carbon|string $start = null): Carbon;
+
+    public function calculateGraceDaysEnd(Carbon $recurrenceEnd): Carbon;
+}

src/Contracts/SubscriptionContract.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace LucasDotVin\Soulbscription\Contracts;
+
+/**
+ * @mixin \Illuminate\Database\Eloquent\Model
+ */
+interface SubscriptionContract
+{
+    //
+}

src/Contracts/SubscriptionRenewalContract.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace LucasDotVin\Soulbscription\Contracts;
+
+/**
+ * @mixin \Illuminate\Database\Eloquent\Model
+ */
+interface SubscriptionRenewalContract
+{
+    //
+}

src/Enums/PeriodicityType.php

@@ -23,7 +23,7 @@ public static function getDateDifference(Carbon $from, Carbon $to, string $unit)
             $delta = 1;
         }
 
-        $unitInPlural = Str::plural($unit);
+        $unitInPlural = Str::plural(Str::studly(Str::lower($unit)));
 
         $differenceMethodName = 'diffIn' . $unitInPlural;
         $difference = abs($from->{$differenceMethodName}($to));

src/Events/FeatureConsumed.php

@@ -5,8 +5,8 @@
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
-use LucasDotVin\Soulbscription\Models\Feature;
-use LucasDotVin\Soulbscription\Models\FeatureConsumption;
+use LucasDotVin\Soulbscription\Contracts\FeatureConsumptionContract;
+use LucasDotVin\Soulbscription\Contracts\FeatureContract;
 
 class FeatureConsumed
 {
@@ -16,8 +16,8 @@ class FeatureConsumed
 
     public function __construct(
         public $subscriber,
-        public Feature $feature,
-        public FeatureConsumption $featureConsumption,
+        public FeatureContract $feature,
+        public FeatureConsumptionContract $featureConsumption,
     ) {
         //
     }

src/Events/FeatureTicketCreated.php

@@ -5,8 +5,8 @@
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
-use LucasDotVin\Soulbscription\Models\Feature;
-use LucasDotVin\Soulbscription\Models\FeatureTicket;
+use LucasDotVin\Soulbscription\Contracts\FeatureContract;
+use LucasDotVin\Soulbscription\Contracts\FeatureTicketContract;
 
 class FeatureTicketCreated
 {
@@ -16,8 +16,8 @@ class FeatureTicketCreated
 
     public function __construct(
         public $subscriber,
-        public Feature $feature,
-        public FeatureTicket $featureTicket,
+        public FeatureContract $feature,
+        public FeatureTicketContract $featureTicket,
     ) {
         //
     }

src/Events/SubscriptionCanceled.php

@@ -5,7 +5,7 @@
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
-use LucasDotVin\Soulbscription\Models\Subscription;
+use LucasDotVin\Soulbscription\Contracts\SubscriptionContract;
 
 class SubscriptionCanceled
 {
@@ -14,7 +14,7 @@ class SubscriptionCanceled
     use SerializesModels;
 
     public function __construct(
-        public Subscription $subscription,
+        public SubscriptionContract $subscription,
     ) {
         //
     }

src/Events/SubscriptionRenewed.php

@@ -5,7 +5,7 @@
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
-use LucasDotVin\Soulbscription\Models\Subscription;
+use LucasDotVin\Soulbscription\Contracts\SubscriptionContract;
 
 class SubscriptionRenewed
 {
@@ -14,7 +14,7 @@ class SubscriptionRenewed
     use SerializesModels;
 
     public function __construct(
-        public Subscription $subscription,
+        public SubscriptionContract $subscription,
     ) {
         //
     }

src/Events/SubscriptionScheduled.php

@@ -5,7 +5,7 @@
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
-use LucasDotVin\Soulbscription\Models\Subscription;
+use LucasDotVin\Soulbscription\Contracts\SubscriptionContract;
 
 class SubscriptionScheduled
 {
@@ -14,7 +14,7 @@ class SubscriptionScheduled
     use SerializesModels;
 
     public function __construct(
-        public Subscription $subscription,
+        public SubscriptionContract $subscription,
     ) {
         //
     }

src/Events/SubscriptionStarted.php

@@ -5,7 +5,7 @@
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
-use LucasDotVin\Soulbscription\Models\Subscription;
+use LucasDotVin\Soulbscription\Contracts\SubscriptionContract;
 
 class SubscriptionStarted
 {
@@ -14,7 +14,7 @@ class SubscriptionStarted
     use SerializesModels;
 
     public function __construct(
-        public Subscription $subscription,
+        public SubscriptionContract $subscription,
     ) {
         //
     }

src/Events/SubscriptionSuppressed.php

@@ -5,7 +5,7 @@
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
-use LucasDotVin\Soulbscription\Models\Subscription;
+use LucasDotVin\Soulbscription\Contracts\SubscriptionContract;
 
 class SubscriptionSuppressed
 {
@@ -14,7 +14,7 @@ class SubscriptionSuppressed
     use SerializesModels;
 
     public function __construct(
-        public Subscription $subscription,
+        public SubscriptionContract $subscription,
     ) {
         //
     }

src/Models/Concerns/Expires.php

@@ -18,12 +18,12 @@ public function initializeExpires()
         }
     }
 
-    public function expired()
+    public function expired(): bool
     {
         return $this->expired_at->isPast();
     }
 
-    public function notExpired()
+    public function notExpired(): bool
     {
         return ! $this->expired();
     }

src/Models/Concerns/HandlesRecurrence.php

@@ -4,7 +4,11 @@
 
 use Illuminate\Support\Carbon;
 use LucasDotVin\Soulbscription\Enums\PeriodicityType;
+use Illuminate\Support\Str;
 
+/**
+ * @property \LucasDotVin\Soulbscription\Enums\PeriodicityType $periodicity_type
+ */
 trait HandlesRecurrence
 {
     public function calculateNextRecurrenceEnd(Carbon|string $start = null): Carbon
@@ -22,7 +26,7 @@ public function calculateNextRecurrenceEnd(Carbon|string $start = null): Carbon
             0,
         );
 
-        $expirationDate = $start->copy()->add($this->periodicity_type, $this->periodicity + $recurrences);
+        $expirationDate = $start->copy()->add(Str::lower($this->periodicity_type), $this->periodicity + $recurrences);
 
         return $expirationDate;
     }