Merge pull request #15 from laravelcm/fix-undefined-method-model-plan

fix: Error on undefined method planSubscriptions

Author: mckenziearts

src/Models/Feature.php

@@ -29,10 +29,10 @@
  * @property int $resettable_period
  * @property string $resettable_interval
  * @property int $sort_order
- * @property \Carbon\Carbon|null $created_at
- * @property \Carbon\Carbon|null $updated_at
- * @property \Carbon\Carbon|null $deleted_at
- * @property-read \Laravelcm\Subscriptions\Models\Plan $plan
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ * @property Carbon|null $deleted_at
+ * @property-read Plan $plan
  * @property-read \Illuminate\Database\Eloquent\Collection|\Laravelcm\Subscriptions\Models\SubscriptionUsage[] $usage
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Feature byPlanId($planId)

src/Models/Plan.php

@@ -140,7 +140,7 @@ protected static function boot(): void
 
         static::deleted(function (Plan $plan): void {
             $plan->features()->delete();
-            $plan->planSubscriptions()->delete();
+            $plan->subscriptions()->delete();
         });
     }
 

src/Models/Subscription.php

@@ -29,17 +29,17 @@
  * @property string $slug
  * @property array $title
  * @property array $description
- * @property \Carbon\Carbon|null $trial_ends_at
- * @property \Carbon\Carbon|null $starts_at
- * @property \Carbon\Carbon|null $ends_at
- * @property \Carbon\Carbon|null $cancels_at
- * @property \Carbon\Carbon|null $canceled_at
- * @property \Carbon\Carbon|null $created_at
- * @property \Carbon\Carbon|null $updated_at
- * @property \Carbon\Carbon|null $deleted_at
- * @property-read \Laravelcm\Subscriptions\Models\Plan $plan
+ * @property Carbon|null $trial_ends_at
+ * @property Carbon|null $starts_at
+ * @property Carbon|null $ends_at
+ * @property Carbon|null $cancels_at
+ * @property Carbon|null $canceled_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ * @property Carbon|null $deleted_at
+ * @property-read Plan $plan
  * @property-read \Illuminate\Database\Eloquent\Collection|\Laravelcm\Subscriptions\Models\SubscriptionUsage[] $usage
- * @property-read \Illuminate\Database\Eloquent\Model $subscriber
+ * @property-read Model $subscriber
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription byPlanId($planId)
  * @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\Subscription findEndedPeriod()
@@ -141,7 +141,7 @@ public function subscriber(): MorphTo
         return $this->morphTo('subscriber', 'subscriber_type', 'subscriber_id', 'id');
     }
 
-    public function usage(): hasMany
+    public function usage(): HasMany
     {
         return $this->hasMany(config('laravel-subscriptions.models.subscription_usage'));
     }
@@ -233,10 +233,10 @@ public function renew(): self
     /**
      * Get bookings of the given subscriber.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $builder
-     * @param \Illuminate\Database\Eloquent\Model $subscriber
+     * @param Builder $builder
+     * @param Model $subscriber
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function scopeOfSubscriber(Builder $builder, Model $subscriber): Builder
     {
@@ -247,10 +247,10 @@ public function scopeOfSubscriber(Builder $builder, Model $subscriber): Builder
     /**
      * Scope subscriptions with ending trial.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $builder
+     * @param Builder $builder
      * @param int $dayRange
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function scopeFindEndingTrial(Builder $builder, int $dayRange = 3): Builder
     {
@@ -263,9 +263,9 @@ public function scopeFindEndingTrial(Builder $builder, int $dayRange = 3): Build
     /**
      * Scope subscriptions with ended trial.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $builder
+     * @param Builder $builder
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function scopeFindEndedTrial(Builder $builder): Builder
     {
@@ -275,10 +275,10 @@ public function scopeFindEndedTrial(Builder $builder): Builder
     /**
      * Scope subscriptions with ending periods.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $builder
+     * @param Builder $builder
      * @param int $dayRange
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function scopeFindEndingPeriod(Builder $builder, int $dayRange = 3): Builder
     {
@@ -291,9 +291,9 @@ public function scopeFindEndingPeriod(Builder $builder, int $dayRange = 3): Buil
     /**
      * Scope subscriptions with ended periods.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $builder
+     * @param Builder $builder
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function scopeFindEndedPeriod(Builder $builder): Builder
     {
@@ -303,9 +303,9 @@ public function scopeFindEndedPeriod(Builder $builder): Builder
     /**
      * Scope all active subscriptions for a user.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $builder
+     * @param Builder $builder
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function scopeFindActive(Builder $builder): Builder
     {

src/Models/SubscriptionUsage.php

@@ -18,12 +18,12 @@
  * @property int $subscription_id
  * @property int $feature_id
  * @property int $used
- * @property \Carbon\Carbon|null $valid_until
- * @property \Carbon\Carbon|null $created_at
- * @property \Carbon\Carbon|null $updated_at
- * @property \Carbon\Carbon|null $deleted_at
- * @property-read \Laravelcm\Subscriptions\Models\Feature $feature
- * @property-read \Laravelcm\Subscriptions\Models\Subscription $subscription
+ * @property Carbon|null $valid_until
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ * @property Carbon|null $deleted_at
+ * @property-read Feature $feature
+ * @property-read Subscription $subscription
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\SubscriptionUsage byFeatureSlug($featureSlug)
  * @method static \Illuminate\Database\Eloquent\Builder|\Laravelcm\Subscriptions\Models\SubscriptionUsage whereCreatedAt($value)

src/Traits/HasPlanSubscriptions.php

@@ -23,7 +23,7 @@ protected static function bootHasSubscriptions(): void
     /**
      * The subscriber may have many plan subscriptions.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     * @return MorphMany
      */
     public function planSubscriptions(): MorphMany
     {

tests/Feature/SubscribeTest.php

@@ -37,7 +37,7 @@
     expect($this->user->planSubscription('main')->active())
         ->toBeTrue()
         ->and($this->user->planSubscription('main')->ends_at->toDateString())
-        ->toBe(\Carbon\Carbon::now()->addMonth()->addDays($this->plan->trial_period)->toDateString());
+        ->toBe(Carbon\Carbon::now()->addMonth()->addDays($this->plan->trial_period)->toDateString());
 })->group('subscribe');
 
 it('user can change plan', function (): void {