format code

harrisonratcliffe · harrisonratcliffe · commit 3d175d5747de · 2024-11-18T21:14:18.000Z
diff --git a/database/factories/FeatureConsumptionFactory.php b/database/factories/FeatureConsumptionFactory.php
@@ -2,8 +2,8 @@
 
 namespace LucasDotVin\Soulbscription\Database\Factories;
 
-use LucasDotVin\Soulbscription\Models\Feature;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use LucasDotVin\Soulbscription\Models\Feature;
 use LucasDotVin\Soulbscription\Models\FeatureConsumption;
 
 class FeatureConsumptionFactory extends Factory
@@ -18,10 +18,10 @@ class FeatureConsumptionFactory extends Factory
     public function definition()
     {
         return [
-            'feature_id'      => Feature::factory(),
-            'consumption'     => $this->faker->randomFloat(),
-            'expired_at'      => $this->faker->dateTime(),
-            'subscriber_id'   => $this->faker->randomNumber(),
+            'feature_id' => Feature::factory(),
+            'consumption' => $this->faker->randomFloat(),
+            'expired_at' => $this->faker->dateTime(),
+            'subscriber_id' => $this->faker->randomNumber(),
             'subscriber_type' => $this->faker->word(),
         ];
     }
diff --git a/database/factories/FeatureFactory.php b/database/factories/FeatureFactory.php
@@ -2,8 +2,8 @@
 
 namespace LucasDotVin\Soulbscription\Database\Factories;
 
-use LucasDotVin\Soulbscription\Enums\PeriodicityType;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use LucasDotVin\Soulbscription\Enums\PeriodicityType;
 use LucasDotVin\Soulbscription\Models\Feature;
 
 class FeatureFactory extends Factory
@@ -18,17 +18,17 @@ class FeatureFactory extends Factory
     public function definition()
     {
         return [
-            'consumable'       => $this->faker->boolean(),
-            'name'             => $this->faker->words(asText: true),
-            'periodicity'      => $this->faker->randomDigitNotNull(),
+            'consumable' => $this->faker->boolean(),
+            'name' => $this->faker->words(asText: true),
+            'periodicity' => $this->faker->randomDigitNotNull(),
             'periodicity_type' => $this->faker->randomElement([
                 PeriodicityType::Year,
                 PeriodicityType::Month,
                 PeriodicityType::Week,
                 PeriodicityType::Day,
             ]),
-            'quota'            => false,
-            'postpaid'         => false,
+            'quota' => false,
+            'postpaid' => false,
         ];
     }
 
diff --git a/database/factories/PlanFactory.php b/database/factories/PlanFactory.php
@@ -2,8 +2,8 @@
 
 namespace LucasDotVin\Soulbscription\Database\Factories;
 
-use LucasDotVin\Soulbscription\Enums\PeriodicityType;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use LucasDotVin\Soulbscription\Enums\PeriodicityType;
 use LucasDotVin\Soulbscription\Models\Plan;
 
 class PlanFactory extends Factory
@@ -18,9 +18,9 @@ class PlanFactory extends Factory
     public function definition()
     {
         return [
-            'grace_days'       => 0,
-            'name'             => $this->faker->words(asText: true),
-            'periodicity'      => $this->faker->randomDigitNotNull(),
+            'grace_days' => 0,
+            'name' => $this->faker->words(asText: true),
+            'periodicity' => $this->faker->randomDigitNotNull(),
             'periodicity_type' => $this->faker->randomElement([
                 PeriodicityType::Year,
                 PeriodicityType::Month,
diff --git a/database/factories/SubscriptionFactory.php b/database/factories/SubscriptionFactory.php
@@ -2,8 +2,8 @@
 
 namespace LucasDotVin\Soulbscription\Database\Factories;
 
-use LucasDotVin\Soulbscription\Models\Plan;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use LucasDotVin\Soulbscription\Models\Plan;
 use LucasDotVin\Soulbscription\Models\Subscription;
 
 class SubscriptionFactory extends Factory
@@ -18,13 +18,13 @@ class SubscriptionFactory extends Factory
     public function definition()
     {
         return [
-            'plan_id'         => Plan::factory(),
-            'canceled_at'     => null,
-            'started_at'      => $this->faker->dateTime(),
-            'suppressed_at'   => null,
-            'expired_at'      => $this->faker->dateTime(),
-            'was_switched'    => false,
-            'subscriber_id'   => $this->faker->randomNumber(),
+            'plan_id' => Plan::factory(),
+            'canceled_at' => null,
+            'started_at' => $this->faker->dateTime(),
+            'suppressed_at' => null,
+            'expired_at' => $this->faker->dateTime(),
+            'was_switched' => false,
+            'subscriber_id' => $this->faker->randomNumber(),
             'subscriber_type' => $this->faker->word(),
         ];
     }
diff --git a/database/factories/SubscriptionRenewalFactory.php b/database/factories/SubscriptionRenewalFactory.php
@@ -2,8 +2,9 @@
 
 namespace LucasDotVin\Soulbscription\Database\Factories;
 
-use LucasDotVin\Soulbscription\Models\{Subscription, SubscriptionRenewal};
 use Illuminate\Database\Eloquent\Factories\Factory;
+use LucasDotVin\Soulbscription\Models\Subscription;
+use LucasDotVin\Soulbscription\Models\SubscriptionRenewal;
 
 class SubscriptionRenewalFactory extends Factory
 {
@@ -18,8 +19,8 @@ public function definition()
     {
         return [
             'subscription_id' => Subscription::factory(),
-            'overdue'         => $this->faker->boolean(),
-            'renewal'         => $this->faker->boolean(),
+            'overdue' => $this->faker->boolean(),
+            'renewal' => $this->faker->boolean(),
         ];
     }
 }
diff --git a/database/migrations/2022_02_01_233701_create_plans_table.php b/database/migrations/2022_02_01_233701_create_plans_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/2022_02_01_235539_create_subscriptions_table.php b/database/migrations/2022_02_01_235539_create_subscriptions_table.php
@@ -2,10 +2,10 @@
 
 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 {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/2022_02_01_235540_create_features_table.php b/database/migrations/2022_02_01_235540_create_features_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/2022_02_02_000527_create_feature_consumptions_table.php b/database/migrations/2022_02_02_000527_create_feature_consumptions_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/2022_02_03_001206_create_subscription_renewals_table.php b/database/migrations/2022_02_03_001206_create_subscription_renewals_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/2022_02_04_001622_create_feature_plan_table.php b/database/migrations/2022_02_04_001622_create_feature_plan_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/2022_02_25_001622_create_feature_tickets_table.php b/database/migrations/2022_02_25_001622_create_feature_tickets_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/upgrades/1.x-2.x/2022_04_22_002342_add_grace_days_column_to_plans_table_table.php b/database/migrations/upgrades/1.x-2.x/2022_04_22_002342_add_grace_days_column_to_plans_table_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/upgrades/1.x-2.x/2022_04_22_002342_add_grace_ended_at_column_to_subscriptions_table_table.php b/database/migrations/upgrades/1.x-2.x/2022_04_22_002342_add_grace_ended_at_column_to_subscriptions_table_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/upgrades/2.1-2.2/2022_05_19_0000_add_quota_column_to_features_table.php b/database/migrations/upgrades/2.1-2.2/2022_05_19_0000_add_quota_column_to_features_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/upgrades/2.4-2.5/2022_05_19_0000_add_postpaid_column_to_features_table.php b/database/migrations/upgrades/2.4-2.5/2022_05_19_0000_add_postpaid_column_to_features_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/upgrades/2.5-2.6/2022_10_10_0000_make_expired_at_column_nullable_on_tickets_table.php b/database/migrations/upgrades/2.5-2.6/2022_10_10_0000_make_expired_at_column_nullable_on_tickets_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/upgrades/4.0-4.1/2023_10_01_0000_make_periodicity_columns_nullable_on_plans_table.php b/database/migrations/upgrades/4.0-4.1/2023_10_01_0000_make_periodicity_columns_nullable_on_plans_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
diff --git a/src/Enums/PeriodicityType.php b/src/Enums/PeriodicityType.php
@@ -19,7 +19,7 @@ public static function getDateDifference(Carbon $from, Carbon $to, string $unit)
     {
         $unitInPlural = Str::plural($unit);
 
-        $differenceMethodName = 'diffIn' . $unitInPlural;
+        $differenceMethodName = 'diffIn'.$unitInPlural;
 
         return $from->{$differenceMethodName}($to);
     }
diff --git a/src/Models/Concerns/Expires.php b/src/Models/Concerns/Expires.php
@@ -8,7 +8,7 @@ trait Expires
 {
     public static function bootExpires()
     {
-        static::addGlobalScope(new ExpiringScope());
+        static::addGlobalScope(new ExpiringScope);
     }
 
     public function initializeExpires()
diff --git a/src/Models/Concerns/ExpiresAndHasGraceDays.php b/src/Models/Concerns/ExpiresAndHasGraceDays.php
@@ -8,7 +8,7 @@ trait ExpiresAndHasGraceDays
 {
     public static function bootExpiresAndHasGraceDays()
     {
-        static::addGlobalScope(new ExpiringWithGraceDaysScope());
+        static::addGlobalScope(new ExpiringWithGraceDaysScope);
     }
 
     public function initializeExpiresAndHasGraceDays()
diff --git a/src/Models/Concerns/HandlesRecurrence.php b/src/Models/Concerns/HandlesRecurrence.php
@@ -7,7 +7,7 @@
 
 trait HandlesRecurrence
 {
-    public function calculateNextRecurrenceEnd(Carbon|string $start = null): Carbon
+    public function calculateNextRecurrenceEnd(Carbon|string|null $start = null): Carbon
     {
         if (empty($start)) {
             $start = now();
diff --git a/src/Models/Concerns/Starts.php b/src/Models/Concerns/Starts.php
@@ -8,7 +8,7 @@ trait Starts
 {
     public static function bootStarts()
     {
-        static::addGlobalScope(new StartingScope());
+        static::addGlobalScope(new StartingScope);
     }
 
     public function initializeStarts()
diff --git a/src/Models/Concerns/Suppresses.php b/src/Models/Concerns/Suppresses.php
@@ -8,7 +8,7 @@ trait Suppresses
 {
     public static function bootSuppresses()
     {
-        static::addGlobalScope(new SuppressingScope());
+        static::addGlobalScope(new SuppressingScope);
     }
 
     public function initializeSuppresses()
diff --git a/src/Models/Scopes/ExpiringScope.php b/src/Models/Scopes/ExpiringScope.php
@@ -17,8 +17,7 @@ class ExpiringScope implements Scope
     public function apply(Builder $builder, Model $model)
     {
         $builder->where(
-            fn (Builder $query) =>
-            $query->where('expired_at', '>', now())
+            fn (Builder $query) => $query->where('expired_at', '>', now())
                 ->orWhereNull('expired_at')
         );
     }
@@ -45,8 +44,7 @@ protected function addWithoutExpired(Builder $builder)
     {
         $builder->macro('withoutExpired', function (Builder $builder) {
             $builder->withoutGlobalScope($this)->where(
-                fn (Builder $query) =>
-                $query->where('expired_at', '>', now())
+                fn (Builder $query) => $query->where('expired_at', '>', now())
                     ->orWhereNull('expired_at')
             );
 
@@ -58,8 +56,7 @@ protected function addOnlyExpired(Builder $builder)
     {
         $builder->macro('onlyExpired', function (Builder $builder) {
             $builder->withoutGlobalScope($this)->where(
-                fn (Builder $query) =>
-                $query->where('expired_at', '<=', now())
+                fn (Builder $query) => $query->where('expired_at', '<=', now())
                     ->whereNotNull('expired_at')
             );
 
diff --git a/src/Models/Scopes/ExpiringWithGraceDaysScope.php b/src/Models/Scopes/ExpiringWithGraceDaysScope.php
@@ -18,9 +18,9 @@ public function apply(Builder $builder, Model $model)
     {
         $builder->where(
             fn (Builder $query) => $query
-            ->where('expired_at', '>', now())
-            ->orWhereNull('expired_at')
-            ->orWhere('grace_days_ended_at', '>', now())
+                ->where('expired_at', '>', now())
+                ->orWhereNull('expired_at')
+                ->orWhere('grace_days_ended_at', '>', now())
         );
     }
 
diff --git a/src/Models/Subscription.php b/src/Models/Subscription.php
@@ -58,10 +58,10 @@ public function subscriber()
     public function scopeNotActive(Builder $query)
     {
         return $query->withoutGlobalScopes([
-                ExpiringWithGraceDaysScope::class,
-                StartingScope::class,
-                SuppressingScope::class,
-            ])
+            ExpiringWithGraceDaysScope::class,
+            StartingScope::class,
+            SuppressingScope::class,
+        ])
             ->where(function (Builder $query) {
                 $query->where(fn (Builder $query) => $query->onlyExpired())
                     ->orWhere(fn (Builder $query) => $query->onlyNotStarted())
diff --git a/src/SoulbscriptionServiceProvider.php b/src/SoulbscriptionServiceProvider.php
diff --git a/tests/TestCase.php b/tests/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace LucasDotVin\Soulbscription\Database\Factories;`
`4`	`4`
`5`		`-use LucasDotVin\Soulbscription\Models\{Subscription, SubscriptionRenewal};`
`6`	`5`	`use Illuminate\Database\Eloquent\Factories\Factory;`
	`6`	`+use LucasDotVin\Soulbscription\Models\Subscription;`
	`7`	`+use LucasDotVin\Soulbscription\Models\SubscriptionRenewal;`
`7`	`8`
`8`	`9`	`class SubscriptionRenewalFactory extends Factory`
`9`	`10`	`{`
`@@ -18,8 +19,8 @@ public function definition()`
`18`	`19`	`{`
`19`	`20`	`return [`
`20`	`21`	`'subscription_id' => Subscription::factory(),`
`21`		`- 'overdue' => $this->faker->boolean(),`
`22`		`- 'renewal' => $this->faker->boolean(),`
	`22`	`+ 'overdue' => $this->faker->boolean(),`
	`23`	`+ 'renewal' => $this->faker->boolean(),`
`23`	`24`	`];`
`24`	`25`	`}`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@`
`4`	`4`	`use Illuminate\Database\Schema\Blueprint;`
`5`	`5`	`use Illuminate\Support\Facades\Schema;`
`6`	`6`
`7`		`-return new class extends Migration {`
	`7`	`+return new class extends Migration`
	`8`	`+{`
`8`	`9`	`/**`
`9`	`10`	`* Run the migrations.`
`10`	`11`	`*`