feat: enhance review timestamps and refactor migration and model code

Signed-off-by: Sam Poyigi <[email protected]>
tastyigniter · Mar 2, 2025 · a9a3f27 · a9a3f27
1 parent 3b00cde
commit a9a3f27
Show file tree

Hide file tree

Showing 45 changed files with 181 additions and 132 deletions.
diff --git a/database/migrations/2020_09_17_000300_create_reviews_table_or_rename.php b/database/migrations/2020_09_17_000300_create_reviews_table_or_rename.php
@@ -1,20 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 use Igniter\Local\Models\ReviewSettings;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
-    public function up()
+    public function up(): void
     {
         if (Schema::hasTable('reviews')) {
             Schema::rename('reviews', 'igniter_reviews');
         }
 
         if (!Schema::hasTable('igniter_reviews')) {
-            Schema::create('igniter_reviews', function(Blueprint $table) {
+            Schema::create('igniter_reviews', function(Blueprint $table): void {
                 $table->engine = 'InnoDB';
                 $table->integer('review_id', true);
                 $table->integer('customer_id');
@@ -41,7 +43,7 @@ public function up()
         ]);
     }
 
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('igniter_reviews');
     }

diff --git a/database/migrations/2020_12_10_000300_update_reviews_table.php b/database/migrations/2020_12_10_000300_update_reviews_table.php
@@ -1,15 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
+use Igniter\Cart\Models\Order;
+use Igniter\Reservation\Models\Reservation;
+
 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
 {
-    public function up()
+    public function up(): void
     {
-        Schema::table('igniter_reviews', function(Blueprint $table) {
+        Schema::table('igniter_reviews', function(Blueprint $table): void {
             $table->integer('customer_id')->nullable()->change();
             $table->string('author')->nullable()->change();
             $table->text('review_text')->nullable()->change();
@@ -18,21 +23,21 @@ public function up()
         $this->updateMorphsOnReviews();
     }
 
-    public function down() {}
+    public function down(): void {}
 
-    protected function updateMorphsOnReviews()
+    protected function updateMorphsOnReviews(): void
     {
         if (DB::table('igniter_reviews')
-            ->where('sale_type', \Igniter\Cart\Models\Order::class)
-            ->orWhere('sale_type', \Igniter\Reservation\Models\Reservation::class)
+            ->where('sale_type', Order::class)
+            ->orWhere('sale_type', Reservation::class)
             ->count()
         ) {
             return;
         }
 
         $morphs = [
-            'order' => \Igniter\Cart\Models\Order::class,
-            'reservation' => \Igniter\Reservation\Models\Reservation::class,
+            'order' => Order::class,
+            'reservation' => Reservation::class,
         ];
 
         DB::table('igniter_reviews')->get()->each(function($model) use ($morphs) {

diff --git a/database/migrations/2021_01_02_000300_add_last_location_area_customers_table.php b/database/migrations/2021_01_02_000300_add_last_location_area_customers_table.php
@@ -1,21 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
-    public function up()
+    public function up(): void
     {
         if (Schema::hasColumn('customers', 'last_location_area')) {
             return;
         }
 
-        Schema::table('customers', function(Blueprint $table) {
+        Schema::table('customers', function(Blueprint $table): void {
             $table->text('last_location_area');
         });
     }
 
-    public function down() {}
+    public function down(): void {}
 };
diff --git a/database/migrations/2021_09_06_010000_add_timestamps_to_reviews.php b/database/migrations/2021_09_06_010000_add_timestamps_to_reviews.php
@@ -1,26 +1,28 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
-    public function up()
+    public function up(): void
     {
         if (!Schema::hasColumn('igniter_reviews', 'date_added')) {
             return;
         }
 
-        Schema::table('igniter_reviews', function(Blueprint $table) {
+        Schema::table('igniter_reviews', function(Blueprint $table): void {
             $table->renameColumn('date_added', 'created_at');
         });
 
-        Schema::table('igniter_reviews', function(Blueprint $table) {
+        Schema::table('igniter_reviews', function(Blueprint $table): void {
             $table->timestamp('created_at')->change();
             $table->timestamp('updated_at');
         });
     }
 
-    public function down() {}
+    public function down(): void {}
 };
diff --git a/database/migrations/2021_11_18_010000_make_primary_key_bigint_all_tables.php b/database/migrations/2021_11_18_010000_make_primary_key_bigint_all_tables.php
@@ -1,20 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
-    public function up()
+    public function up(): void
     {
-        Schema::table('igniter_reviews', function(Blueprint $table) {
+        Schema::table('igniter_reviews', function(Blueprint $table): void {
             $table->unsignedBigInteger('review_id', true)->change();
             $table->unsignedBigInteger('customer_id')->nullable()->change();
             $table->unsignedBigInteger('sale_id')->nullable()->change();
             $table->unsignedBigInteger('location_id')->nullable()->change();
         });
     }
 
-    public function down() {}
+    public function down(): void {}
 };
diff --git a/database/migrations/2024_06_04_010000_rename_sale_type_sale_id_reviews.php b/database/migrations/2024_06_04_010000_rename_sale_type_sale_id_reviews.php
@@ -1,18 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
-    public function up()
+    public function up(): void
     {
-        Schema::table('igniter_reviews', function(Blueprint $table) {
+        Schema::table('igniter_reviews', function(Blueprint $table): void {
             $table->renameColumn('sale_id', 'reviewable_id');
             $table->renameColumn('sale_type', 'reviewable_type');
         });
     }
 
-    public function down() {}
+    public function down(): void {}
 };
diff --git a/rector.php b/rector.php
@@ -8,13 +8,18 @@
 
 return RectorConfig::configure()
     ->withImportNames(removeUnusedImports: true)
-    ->withPaths([__DIR__.'/src', __DIR__.'/tests'])
+    ->withPaths([
+        __DIR__.'/database',
+        __DIR__.'/src',
+        __DIR__.'/tests',
+    ])
     ->withRules([
         DeclareStrictTypesRector::class,
     ])
     ->withSkip([
         ReturnTypeFromStrictNewArrayRector::class,
     ])
+    ->withPhpSets(php83: true)
     ->withPreparedSets(
         deadCode: true,
         codeQuality: true,

diff --git a/src/AutomationRules/Conditions/ReviewCount.php b/src/AutomationRules/Conditions/ReviewCount.php
@@ -4,6 +4,7 @@
 
 namespace Igniter\Local\AutomationRules\Conditions;
 
+use Override;
 use Igniter\Automation\AutomationException;
 use Igniter\Automation\Classes\BaseModelAttributesCondition;
 use Igniter\Cart\Models\Order;
@@ -16,6 +17,7 @@ class ReviewCount extends BaseModelAttributesCondition
 
     protected $modelAttributes;
 
+    #[Override]
     public function conditionDetails(): array
     {
         return [
@@ -24,6 +26,7 @@ public function conditionDetails(): array
         ];
     }
 
+    #[Override]
     public function defineModelAttributes(): array
     {
         return [
@@ -50,6 +53,7 @@ public function getReviewCountAttribute($value, $object)
      * @param array $params Specifies a list of parameters as an associative array.
      * @return bool
      */
+    #[Override]
     public function isTrue(&$params)
     {
         if (!$orderOrReservation = array_get($params, 'order', array_get($params, 'reservation'))) {

diff --git a/src/CartConditions/Delivery.php b/src/CartConditions/Delivery.php
@@ -4,6 +4,7 @@
 
 namespace Igniter\Local\CartConditions;
 
+use Override;
 use Igniter\Cart\CartCondition;
 use Igniter\Cart\Facades\Cart;
 use Igniter\Local\Facades\Location;
@@ -15,6 +16,7 @@ class Delivery extends CartCondition
 
     protected $deliveryCharge = 0;
 
+    #[Override]
     public function beforeApply(): ?bool
     {
         // Do not apply condition when orderType is not delivery
@@ -28,20 +30,23 @@ public function beforeApply(): ?bool
         return null;
     }
 
+    #[Override]
     public function getRules(): array
     {
         return [
             $this->deliveryCharge.' >= 0',
         ];
     }
 
+    #[Override]
     public function getActions(): array
     {
         return [
             ['value' => '+'.$this->deliveryCharge],
         ];
     }
 
+    #[Override]
     public function getValue()
     {
         return $this->calculatedValue > 0 ? $this->calculatedValue : lang('igniter::main.text_free');

diff --git a/src/Classes/CoveredArea.php b/src/Classes/CoveredArea.php
@@ -16,11 +16,8 @@
  */
 class CoveredArea
 {
-    protected LocationArea $model;
-
-    public function __construct(LocationArea $model)
+    public function __construct(protected LocationArea $model)
     {
-        $this->model = $model;
     }
 
     public function deliveryAmount($cartTotal): float|int
@@ -42,9 +39,7 @@ public function listConditions(): Collection
 
     public function getConditionLabels(): array
     {
-        return $this->listConditions()->map(function(CoveredAreaCondition $condition): string {
-            return ucfirst(strtolower($condition->getLabel()));
-        })->all();
+        return $this->listConditions()->map(fn(CoveredAreaCondition $condition): string => ucfirst(strtolower($condition->getLabel())))->all();
     }
 
     protected function getConditionValue($type, $cartTotal): float|int
@@ -68,9 +63,7 @@ protected function getConditionValue($type, $cartTotal): float|int
 
     protected function checkConditions($cartTotal, $value = 'total'): ?CoveredAreaCondition
     {
-        return $this->listConditions()->first(function(CoveredAreaCondition $condition) use ($cartTotal): bool {
-            return $condition->isValid($cartTotal);
-        });
+        return $this->listConditions()->first(fn(CoveredAreaCondition $condition): bool => $condition->isValid($cartTotal));
     }
 
     protected function calculateDistanceCharges(): float|int
@@ -85,16 +78,12 @@ protected function calculateDistanceCharges(): float|int
 
         $condition = $distanceCharges
             ->sortBy('priority')
-            ->map(function(array $condition): CoveredAreaCondition {
-                return new CoveredAreaCondition([
-                    'type' => $condition['type'],
-                    'amount' => $condition['charge'],
-                    'total' => $condition['distance'],
-                ]);
-            })
-            ->first(function(CoveredAreaCondition $condition) use ($distanceFromLocation): bool {
-                return $condition->isValid($distanceFromLocation);
-            });
+            ->map(fn(array $condition): CoveredAreaCondition => new CoveredAreaCondition([
+                'type' => $condition['type'],
+                'amount' => $condition['charge'],
+                'total' => $condition['distance'],
+            ]))
+            ->first(fn(CoveredAreaCondition $condition): bool => $condition->isValid($distanceFromLocation));
 
         return optional($condition)->amount ?? 0;
     }

diff --git a/src/Classes/Location.php b/src/Classes/Location.php
@@ -466,9 +466,7 @@ public function orderTimeInterval()
 
     public function checkNoOrderTypeAvailable()
     {
-        return $this->getOrderTypes()->filter(function($orderType): bool {
-            return !$orderType->isDisabled();
-        })->isEmpty();
+        return $this->getOrderTypes()->filter(fn($orderType): bool => !$orderType->isDisabled())->isEmpty();
     }
 
     public function hasLaterSchedule(): bool

diff --git a/src/Classes/ScheduleItem.php b/src/Classes/ScheduleItem.php
@@ -8,8 +8,6 @@
 
 class ScheduleItem
 {
-    public string $name;
-
     public string $type;
 
     public array $days;
@@ -27,9 +25,8 @@ class ScheduleItem
      */
     protected $data;
 
-    public function __construct(string $name)
+    public function __construct(public string $name)
     {
-        $this->name = $name;
     }
 
     public static function create(string $name, array $data = []): self

diff --git a/src/Classes/WorkingDay.php b/src/Classes/WorkingDay.php
@@ -58,7 +58,7 @@ public static function toISO(string $day): int
 
     public static function normalizeName($day): string
     {
-        $day = strtolower($day);
+        $day = strtolower((string) $day);
 
         if (!static::isValid($day)) {
             throw new WorkingHourException(sprintf("Day `%s` isn't a valid day name. Valid day names are lowercase english words, e.g. `monday`, `thursday`.", $day));