Fix a critical bug: refactors model bindings to use config-based resolution

database/factories/FeatureConsumptionFactory.php

@@ -2,13 +2,15 @@
 
 namespace LucasDotVin\Soulbscription\Database\Factories;
 
-use LucasDotVin\Soulbscription\Models\Feature;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use LucasDotVin\Soulbscription\Models\FeatureConsumption;
-
 class FeatureConsumptionFactory extends Factory
 {
-    protected $model = FeatureConsumption::class;
+    protected $model;
+
+    public function __construct()
+    {
+        $this->model = config('soulbscription.models.feature_consumption');
+    }
 
     /**
      * Define the model's default state.
@@ -18,7 +20,7 @@ class FeatureConsumptionFactory extends Factory
     public function definition()
     {
         return [
-            'feature_id'      => Feature::factory(),
+            'feature_id'      => config('soulbscription.models.feature')::factory(),
             'consumption'     => $this->faker->randomFloat(),
             'expired_at'      => $this->faker->dateTime(),
             'subscriber_id'   => $this->faker->randomNumber(),

database/factories/FeatureFactory.php

@@ -4,11 +4,15 @@
 
 use LucasDotVin\Soulbscription\Enums\PeriodicityType;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use LucasDotVin\Soulbscription\Models\Feature;
 
 class FeatureFactory extends Factory
 {
-    protected $model = Feature::class;
+    protected $model;
+
+    public function __construct()
+    {
+        $this->model = config('soulbscription.models.feature');
+    }
 
     /**
      * Define the model's default state.

database/factories/PlanFactory.php

@@ -4,11 +4,15 @@
 
 use LucasDotVin\Soulbscription\Enums\PeriodicityType;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use LucasDotVin\Soulbscription\Models\Plan;
 
 class PlanFactory extends Factory
 {
-    protected $model = Plan::class;
+    protected $model;
+
+    public function __construct()
+    {
+        $this->model = config('soulbscription.models.plan');
+    }
 
     /**
      * Define the model's default state.

database/factories/SubscriptionFactory.php

@@ -2,13 +2,16 @@
 
 namespace LucasDotVin\Soulbscription\Database\Factories;
 
-use LucasDotVin\Soulbscription\Models\Plan;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use LucasDotVin\Soulbscription\Models\Subscription;
 
 class SubscriptionFactory extends Factory
 {
-    protected $model = Subscription::class;
+    protected $model;
+
+    public function __construct()
+    {
+        $this->model = config('soulbscription.models.subscription');
+    }
 
     /**
      * Define the model's default state.
@@ -18,7 +21,7 @@ class SubscriptionFactory extends Factory
     public function definition()
     {
         return [
-            'plan_id'         => Plan::factory(),
+            'plan_id'         => config('soulbscription.models.plan')::factory(),
             'canceled_at'     => null,
             'started_at'      => $this->faker->dateTime(),
             'suppressed_at'   => null,

database/factories/SubscriptionRenewalFactory.php

@@ -2,12 +2,16 @@
 
 namespace LucasDotVin\Soulbscription\Database\Factories;
 
-use LucasDotVin\Soulbscription\Models\{Subscription, SubscriptionRenewal};
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class SubscriptionRenewalFactory extends Factory
 {
-    protected $model = SubscriptionRenewal::class;
+    protected $model;
+
+    public function __construct()
+    {
+        $this->model = config('soulbscription.models.subscription_renewal');
+    }
 
     /**
      * Define the model's default state.
@@ -17,7 +21,7 @@ class SubscriptionRenewalFactory extends Factory
     public function definition()
     {
         return [
-            'subscription_id' => Subscription::factory(),
+            'subscription_id' => config('soulbscription.models.subscription')::factory(),
             'overdue'         => $this->faker->boolean(),
             'renewal'         => $this->faker->boolean(),
         ];

database/migrations/2022_02_01_235539_create_subscriptions_table.php

@@ -2,7 +2,6 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 return new class() extends Migration {
@@ -15,7 +14,7 @@ public function up()
     {
         Schema::create('subscriptions', function (Blueprint $table) {
             $table->id();
-            $table->foreignIdFor(\LucasDotVin\Soulbscription\Models\Plan::class);
+            $table->foreignIdFor(config('soulbscription.models.plan')::class);
             $table->timestamp('canceled_at')->nullable();
             $table->timestamp('expired_at')->nullable();
             $table->timestamp('grace_days_ended_at')->nullable();

database/migrations/2022_02_02_000527_create_feature_consumptions_table.php

@@ -16,7 +16,7 @@ public function up()
             $table->id();
             $table->decimal('consumption')->unsigned()->nullable();
             $table->timestamp('expired_at')->nullable();
-            $table->foreignIdFor(\LucasDotVin\Soulbscription\Models\Feature::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(config('soulbscription.models.feature')::class)->constrained()->cascadeOnDelete();
             $table->timestamps();
 
             if (config('soulbscription.models.subscriber.uses_uuid')) {

database/migrations/2022_02_03_001206_create_subscription_renewals_table.php

@@ -16,7 +16,7 @@ public function up()
             $table->id();
             $table->boolean('overdue');
             $table->boolean('renewal');
-            $table->foreignIdFor(\LucasDotVin\Soulbscription\Models\Subscription::class);
+            $table->foreignIdFor(config('soulbscription.models.subscription')::class);
             $table->timestamps();
         });
     }

database/migrations/2022_02_04_001622_create_feature_plan_table.php

@@ -15,8 +15,8 @@ public function up()
         Schema::create('feature_plan', function (Blueprint $table) {
             $table->id();
             $table->decimal('charges')->nullable();
-            $table->foreignIdFor(\LucasDotVin\Soulbscription\Models\Feature::class)->constrained()->cascadeOnDelete();
-            $table->foreignIdFor(\LucasDotVin\Soulbscription\Models\Plan::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(config('soulbscription.models.plan')::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(config('soulbscription.models.feature')::class)->constrained()->cascadeOnDelete();
             $table->timestamps();
         });
     }

database/migrations/2022_02_25_001622_create_feature_tickets_table.php

@@ -16,7 +16,7 @@ public function up()
             $table->id();
             $table->decimal('charges')->nullable();
             $table->timestamp('expired_at')->nullable();
-            $table->foreignIdFor(\LucasDotVin\Soulbscription\Models\Feature::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(config('soulbscription.models.feature')::class)->constrained()->cascadeOnDelete();
             $table->timestamps();
 
             if (config('soulbscription.models.subscriber.uses_uuid')) {

src/Events/FeatureConsumed.php

@@ -2,23 +2,39 @@
 
 namespace LucasDotVin\Soulbscription\Events;
 
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
+use InvalidArgumentException;
 use Illuminate\Queue\SerializesModels;
-use LucasDotVin\Soulbscription\Models\Feature;
-use LucasDotVin\Soulbscription\Models\FeatureConsumption;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
 
 class FeatureConsumed
 {
     use Dispatchable;
-    use InteractsWithSockets;
     use SerializesModels;
+    use InteractsWithSockets;
+
+    public mixed $feature;
+    public mixed $subscriber;
+    public mixed $featureConsumption;
 
     public function __construct(
-        public $subscriber,
-        public Feature $feature,
-        public FeatureConsumption $featureConsumption,
+        $subscriber,
+        mixed $feature,
+        mixed $featureConsumption
     ) {
-        //
+        $featureClass = config('soulbscription.models.feature');
+        $featureConsumptionClass = config('soulbscription.models.feature_consumption');
+
+        throw_if(!($feature instanceof $featureClass), new InvalidArgumentException(
+            "Feature must be an instance of $featureClass."
+        ));
+
+        throw_if(!($featureConsumption instanceof $featureConsumptionClass), new InvalidArgumentException(
+            "FeatureConsumption must be an instance of $featureConsumptionClass."
+        ));
+
+        $this->feature = $feature;
+        $this->subscriber = $subscriber;
+        $this->featureConsumption = $featureConsumption;
     }
 }

src/Events/FeatureTicketCreated.php

@@ -2,23 +2,39 @@
 
 namespace LucasDotVin\Soulbscription\Events;
 
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
+use InvalidArgumentException;
 use Illuminate\Queue\SerializesModels;
-use LucasDotVin\Soulbscription\Models\Feature;
-use LucasDotVin\Soulbscription\Models\FeatureTicket;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
 
 class FeatureTicketCreated
 {
     use Dispatchable;
-    use InteractsWithSockets;
     use SerializesModels;
+    use InteractsWithSockets;
+
+    public mixed $feature;
+    public mixed $subscriber;
+    public mixed $featureTicket;
 
     public function __construct(
-        public $subscriber,
-        public Feature $feature,
-        public FeatureTicket $featureTicket,
+        $subscriber,
+        mixed $feature,
+        mixed $featureTicket
     ) {
-        //
+        $featureClass = config('soulbscription.models.feature');
+        $featureTicketClass = config('soulbscription.models.feature_ticket');
+
+        throw_if(!($feature instanceof $featureClass), new InvalidArgumentException(
+            "Feature must be an instance of $featureClass."
+        ));
+
+        throw_if(!($featureTicket instanceof $featureTicketClass), new InvalidArgumentException(
+            "FeatureTicket must be an instance of $featureTicketClass."
+        ));
+
+        $this->feature = $feature;
+        $this->subscriber = $subscriber;
+        $this->featureTicket = $featureTicket;
     }
 }

src/Events/SubscriptionCanceled.php

@@ -2,20 +2,27 @@
 
 namespace LucasDotVin\Soulbscription\Events;
 
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
+use InvalidArgumentException;
 use Illuminate\Queue\SerializesModels;
-use LucasDotVin\Soulbscription\Models\Subscription;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
 
 class SubscriptionCanceled
 {
     use Dispatchable;
-    use InteractsWithSockets;
     use SerializesModels;
+    use InteractsWithSockets;
+
+    public mixed $subscription;
+
+    public function __construct(mixed $subscription)
+    {
+        $subscriptionClass = config('soulbscription.models.subscription');
+
+        throw_if(!($subscription instanceof $subscriptionClass), new InvalidArgumentException(
+            "Subscription must be an instance of $subscriptionClass."
+        ));
 
-    public function __construct(
-        public Subscription $subscription,
-    ) {
-        //
+        $this->subscription = $subscription;
     }
 }

src/Events/SubscriptionRenewed.php

@@ -2,20 +2,27 @@
 
 namespace LucasDotVin\Soulbscription\Events;
 
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
+use InvalidArgumentException;
 use Illuminate\Queue\SerializesModels;
-use LucasDotVin\Soulbscription\Models\Subscription;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
 
 class SubscriptionRenewed
 {
     use Dispatchable;
-    use InteractsWithSockets;
     use SerializesModels;
+    use InteractsWithSockets;
+
+    public mixed $subscription;
+
+    public function __construct(mixed $subscription)
+    {
+        $subscriptionClass = config('soulbscription.models.subscription');
+
+        throw_if(!($subscription instanceof $subscriptionClass), new InvalidArgumentException(
+            "Subscription must be an instance of $subscriptionClass."
+        ));
 
-    public function __construct(
-        public Subscription $subscription,
-    ) {
-        //
+        $this->subscription = $subscription;
     }
 }

src/Events/SubscriptionScheduled.php

@@ -2,20 +2,27 @@
 
 namespace LucasDotVin\Soulbscription\Events;
 
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
+use InvalidArgumentException;
 use Illuminate\Queue\SerializesModels;
-use LucasDotVin\Soulbscription\Models\Subscription;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
 
 class SubscriptionScheduled
 {
     use Dispatchable;
-    use InteractsWithSockets;
     use SerializesModels;
+    use InteractsWithSockets;
+
+    public mixed $subscription;
+
+    public function __construct(mixed $subscription)
+    {
+        $subscriptionClass = config('soulbscription.models.subscription');
+
+        throw_if(!($subscription instanceof $subscriptionClass), new InvalidArgumentException(
+            "Subscription must be an instance of $subscriptionClass."
+        ));
 
-    public function __construct(
-        public Subscription $subscription,
-    ) {
-        //
+        $this->subscription = $subscription;
     }
 }