From 4652a4aed2002e0cce10760e4d459eca4ab4d4e3 Mon Sep 17 00:00:00 2001 From: ajaycalicut17 Date: Wed, 1 May 2024 13:59:58 +0530 Subject: [PATCH] Revert "optimization" This reverts commit d68d752ec22edea202d937450bd64685c89c9693. --- src/Listeners/DeletedFromTrash.php | 7 +++++-- src/Listeners/RestoredFromTrash.php | 4 ++-- src/Models/Trash.php | 12 +++++++----- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/Listeners/DeletedFromTrash.php b/src/Listeners/DeletedFromTrash.php index 23dc8ea..a1830e1 100644 --- a/src/Listeners/DeletedFromTrash.php +++ b/src/Listeners/DeletedFromTrash.php @@ -14,8 +14,11 @@ public function __construct() // } - public function handle(DeleteFromTrash $event): void + /** + * Handle the event. + */ + public function handle(DeleteFromTrash $deleteFromTrash): void { - $event->model->trashable()->forceDelete(); + $deleteFromTrash->model->trashable()->forceDelete(); } } diff --git a/src/Listeners/RestoredFromTrash.php b/src/Listeners/RestoredFromTrash.php index 47421e6..992447d 100644 --- a/src/Listeners/RestoredFromTrash.php +++ b/src/Listeners/RestoredFromTrash.php @@ -17,8 +17,8 @@ public function __construct() /** * Handle the event. */ - public function handle(RestoreFromTrash $event): void + public function handle(RestoreFromTrash $restoreFromTrash): void { - $event->model->trashable()->restore(); + $restoreFromTrash->model->trashable()->restore(); } } diff --git a/src/Models/Trash.php b/src/Models/Trash.php index 6520069..8f271a1 100644 --- a/src/Models/Trash.php +++ b/src/Models/Trash.php @@ -35,9 +35,9 @@ public function trashable(): MorphTo } /** - * Restore the associated model from the trash. + * restore associated model form trash. */ - public function restoreFromTrash(): self + public function restoreFromTrash(): Trash { $this->deleteQuietly(); @@ -55,11 +55,13 @@ public function deleteFromTrash(): ?bool } /** - * Delete all trashed models and their associated models. + * delete all trashed model and associated model. */ - public static function emptyTrash(): void + public static function emptyTrash(): LazyCollection { - static::cursor()->each(fn (Trash $trash) => $trash->delete()); + return static::cursor()->each(function ($each) { + $each->delete(); + }); } /**