Fix gerardojbaez#11

Nakuro · Nov 15, 2017 · d4480de · d4480de
1 parent f8d1e67
commit d4480de
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/src/LaraPlans/Contracts/PlanSubscriptionInterface.php b/src/LaraPlans/Contracts/PlanSubscriptionInterface.php
@@ -8,10 +8,10 @@ public function subscribable();
     public function plan();
     public function usage();
     public function getStatusAttribute();
-    public function active();
+    public function isActive();
     public function onTrial();
-    public function canceled();
-    public function ended();
+    public function isCanceled();
+    public function isEnded();
     public function renew();
     public function cancel($immediately);
     public function changePlan($plan);

diff --git a/src/LaraPlans/Models/PlanSubscription.php b/src/LaraPlans/Models/PlanSubscription.php
@@ -105,11 +105,11 @@ public function usage()
      */
     public function getStatusAttribute()
     {
-        if ($this->active()) {
+        if ($this->isActive()) {
             return self::STATUS_ACTIVE;
         }
 
-        if ($this->canceled()) {
+        if ($this->isCanceled()) {
             return self::STATUS_CANCELED;
         }
     }
@@ -119,9 +119,9 @@ public function getStatusAttribute()
      *
      * @return bool
      */
-    public function active()
+    public function isActive()
     {
-        if (! $this->ended() or $this->onTrial()) {
+        if (! $this->isEnded() or $this->onTrial()) {
             return true;
         }
 
@@ -147,7 +147,7 @@ public function onTrial()
      *
      * @return bool
      */
-    public function canceled()
+    public function isCanceled()
     {
         return  ! is_null($this->canceled_at);
     }
@@ -157,7 +157,7 @@ public function canceled()
      *
      * @return bool
      */
-    public function ended()
+    public function isEnded()
     {
         $endsAt = Carbon::instance($this->ends_at);
 
@@ -223,7 +223,7 @@ public function changePlan($plan)
      */
     public function renew()
     {
-        if ($this->ended() and $this->canceled()) {
+        if ($this->isEnded() and $this->isCanceled()) {
             throw new LogicException(
                 'Unable to renew canceled ended subscription.'
             );

diff --git a/src/LaraPlans/Traits/PlanSubscriber.php b/src/LaraPlans/Traits/PlanSubscriber.php
@@ -56,10 +56,10 @@ public function subscribed($subscription = 'default', $planId = null)
         }
 
         if (is_null($planId)) {
-            return $subscription->active();
+            return $subscription->isActive();
         }
 
-        if ($planId == $subscription->plan_id and $subscription->active()) {
+        if ($planId == $subscription->plan_id and $subscription->isActive()) {
             return true;
         }
 

diff --git a/tests/integration/Models/PlanSubscriptionTest.php b/tests/integration/Models/PlanSubscriptionTest.php
@@ -84,9 +84,9 @@ public function it_gets_subscribable_model_instance()
      * @test
      * @return void
      */
-    public function it_is_active()
+    public function it_is_isActive()
     {
-        $this->assertTrue($this->subscription->active());
+        $this->assertTrue($this->subscription->isActive());
         $this->assertEquals(PlanSubscription::STATUS_ACTIVE, $this->subscription->status);
     }
 
@@ -96,21 +96,21 @@ public function it_is_active()
      * @test
      * @return void
      */
-    public function it_is_canceled()
+    public function it_is_isCanceled()
     {
         // Cancel subscription at period end...
         $this->subscription->cancel();
         $this->subscription->trial_ends_at = null;
 
-        $this->assertTrue($this->subscription->canceled());
-        $this->assertTrue($this->subscription->active());
+        $this->assertTrue($this->subscription->isCanceled());
+        $this->assertTrue($this->subscription->isActive());
         $this->assertEquals(PlanSubscription::STATUS_ACTIVE, $this->subscription->status);
 
         // Cancel subscription immediately...
         $this->subscription->cancel(true);
 
-        $this->assertTrue($this->subscription->canceled());
-        $this->assertFalse($this->subscription->active());
+        $this->assertTrue($this->subscription->isCanceled());
+        $this->assertFalse($this->subscription->isActive());
         $this->assertEquals(PlanSubscription::STATUS_CANCELED, $this->subscription->status);
     }
 
@@ -124,13 +124,13 @@ public function it_is_trialling()
     {
         // Test if subscription is active after applying a trial.
         $this->subscription->trial_ends_at = $this->subscription->trial_ends_at->addDays(2);
-        $this->assertTrue($this->subscription->active());
+        $this->assertTrue($this->subscription->isActive());
         $this->assertEquals(PlanSubscription::STATUS_ACTIVE, $this->subscription->status);
 
         // Test if subscription is inactive after removing the trial.
         $this->subscription->trial_ends_at = Carbon::now()->subDay();
         $this->subscription->cancel(true);
-        $this->assertFalse($this->subscription->active());
+        $this->assertFalse($this->subscription->isActive());
     }
 
      /**
@@ -150,11 +150,11 @@ public function it_can_be_renewed()
             'ends_at' => Carbon::now()->subMonth(),
         ]);
 
-        $this->assertFalse($subscription->active());
+        $this->assertFalse($subscription->isActive());
 
         $subscription->renew();
 
-        $this->assertTrue($subscription->active());
+        $this->assertTrue($subscription->isActive());
         $this->assertEquals(Carbon::now()->addMonth(), $subscription->ends_at);
     }