From 61a911dd39f71c914abe407705f690b33cf7cf08 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 6 Feb 2021 13:29:39 +0000 Subject: [PATCH] Removed "isA" usages from trashcan --- app/Entities/Tools/TrashCan.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Entities/Tools/TrashCan.php b/app/Entities/Tools/TrashCan.php index 7be432f4c..df98fd318 100644 --- a/app/Entities/Tools/TrashCan.php +++ b/app/Entities/Tools/TrashCan.php @@ -273,11 +273,11 @@ class TrashCan $count++; }; - if ($entity->isA('chapter') || $entity->isA('book')) { + if ($entity instanceof Chapter || $entity instanceof Book) { $entity->pages()->withTrashed()->withCount('deletions')->get()->each($restoreAction); } - if ($entity->isA('book')) { + if ($entity instanceof Book) { $entity->chapters()->withTrashed()->withCount('deletions')->get()->each($restoreAction); } @@ -286,19 +286,20 @@ class TrashCan /** * Destroy the given entity. + * @throws Exception */ protected function destroyEntity(Entity $entity): int { - if ($entity->isA('page')) { + if ($entity instanceof Page) { return $this->destroyPage($entity); } - if ($entity->isA('chapter')) { + if ($entity instanceof Chapter) { return $this->destroyChapter($entity); } - if ($entity->isA('book')) { + if ($entity instanceof Book) { return $this->destroyBook($entity); } - if ($entity->isA('bookshelf')) { + if ($entity instanceof Bookshelf) { return $this->destroyShelf($entity); } }