refactor: simplify on deleted logic and check if array key exists

gsmeira · Sep 26, 2023 · cd9144d · cd9144d
1 parent 32634b9
commit cd9144d
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/Traits/HasAttachments.php b/src/Traits/HasAttachments.php
@@ -44,9 +44,7 @@ public static function bootHasAttachments(): void
         $self = new static;
 
         $self::deleted(static function (Model $model) use ($self) {
-            if (!isset($model->forceDeleting)) {
-                $self->removeAttachments($model);
-            } else if ($model->forceDeleting) {
+            if (!isset($model->forceDeleting) || $model->forceDeleting) {
                 $self->removeAttachments($model);
             }
         });
@@ -131,7 +129,7 @@ protected function mergeAttachments(?array $newAttachments): ?array
         $rawAttachments = $this->getRawAttachments();
 
         foreach ($newAttachments as $key => $path) {
-            if (!empty($rawAttachments[$key])) {
+            if (Arr::exists($rawAttachments, $key)) {
                 $this->deleteAttachment($key);
             }
         }