trash pruning config changed

ajaycalicut17 · Sep 14, 2023 · 26e371c · 26e371c
1 parent a2b8bc5
commit 26e371c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/config/trash.php b/config/trash.php
@@ -11,6 +11,8 @@
     |
     */
 
-    'pruning_status' => false,
-    'pruning_period' => now()->subMonth(),
+    'pruning' => [
+        'status' => false,
+        'period' => now()->subMonth(),
+    ],
 ];
diff --git a/src/Models/Trash.php b/src/Models/Trash.php
@@ -69,8 +69,8 @@ public static function emptyTrash(): LazyCollection
      */
     public function prunable(): Builder
     {
-        return static::where('created_at', '<=', config('trash.pruning_period'))
-            ->when(! config('trash.pruning_status'), function ($when) {
+        return static::where('created_at', '<=', config('trash.pruning.period'))
+            ->when(! config('trash.pruning.status'), function ($when) {
                 $when->whereNull('id');
             });
     }

diff --git a/tests/Feature/TrashTest.php b/tests/Feature/TrashTest.php
@@ -94,15 +94,15 @@
         $trashes[$key]['trashable_type'] = $user::class;
         $trashes[$key]['trashable_id'] = $user->id;
         $trashes[$key]['name'] = User::trashName($user);
-        $trashes[$key]['created_at'] = config('trash.pruning_period');
-        $trashes[$key]['updated_at'] = config('trash.pruning_period');
+        $trashes[$key]['created_at'] = config('trash.pruning.period');
+        $trashes[$key]['updated_at'] = config('trash.pruning.period');
     });
 
     Trash::insert($trashes);
 
     assertDatabaseCount('trashes', 10);
 
-    config(['trash.pruning_status' => true]);
+    config(['trash.pruning.status' => true]);
 
     $result = artisan('model:prune', [
         '--model' => Trash::class,
@@ -129,8 +129,8 @@
         $trashes[$key]['trashable_type'] = $user::class;
         $trashes[$key]['trashable_id'] = $user->id;
         $trashes[$key]['name'] = User::trashName($user);
-        $trashes[$key]['created_at'] = config('trash.pruning_period');
-        $trashes[$key]['updated_at'] = config('trash.pruning_period');
+        $trashes[$key]['created_at'] = config('trash.pruning.period');
+        $trashes[$key]['updated_at'] = config('trash.pruning.period');
     });
 
     Trash::insert($trashes);