Updated cover image methods so image parameter is not optional but still nullable

diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php
index 23f07f82049bc8342346b33c8b889c11f155755e..7c25e49813e18bf7f34b42ce68df72c780f141fa 100644 (file)
--- a/app/Entities/Repos/BaseRepo.php
+++ b/app/Entities/Repos/BaseRepo.php
@@ -76,7 +76,7 @@ class BaseRepo
      * @throws ImageUploadException
      * @throws \Exception
      */
      * @throws ImageUploadException
      * @throws \Exception
      */

-    public function updateCoverImage(HasCoverImage $entity, UploadedFile $coverImage = null, bool $removeImage = false)
+    public function updateCoverImage(HasCoverImage $entity, ?UploadedFile $coverImage, bool $removeImage = false)

     {
         if ($coverImage) {
             $this->imageRepo->destroyImage($entity->cover);
     {
         if ($coverImage) {
             $this->imageRepo->destroyImage($entity->cover);

diff --git a/app/Entities/Repos/BookRepo.php b/app/Entities/Repos/BookRepo.php
index 7fcc80face7c3833fd87c991402f62fbd37e2926..70db0fa65750bde4266c97040939d7a0b55c098a 100644 (file)
--- a/app/Entities/Repos/BookRepo.php
+++ b/app/Entities/Repos/BookRepo.php
@@ -108,7 +108,7 @@ class BookRepo
      * @throws ImageUploadException
      * @throws Exception
      */
      * @throws ImageUploadException
      * @throws Exception
      */

-    public function updateCoverImage(Book $book, UploadedFile $coverImage = null, bool $removeImage = false)
+    public function updateCoverImage(Book $book, ?UploadedFile $coverImage, bool $removeImage = false)

     {
         $this->baseRepo->updateCoverImage($book, $coverImage, $removeImage);
     }
     {
         $this->baseRepo->updateCoverImage($book, $coverImage, $removeImage);
     }

diff --git a/app/Entities/Repos/BookshelfRepo.php b/app/Entities/Repos/BookshelfRepo.php
index 03b54f009a5ae6215656b39cdf2cb023db6513e3..25fa97dae00d22ac283b3ddb1a31de467ab7ae53 100644 (file)
--- a/app/Entities/Repos/BookshelfRepo.php
+++ b/app/Entities/Repos/BookshelfRepo.php
@@ -123,7 +123,7 @@ class BookshelfRepo
      * @throws ImageUploadException
      * @throws Exception
      */
      * @throws ImageUploadException
      * @throws Exception
      */

-    public function updateCoverImage(Bookshelf $shelf, UploadedFile $coverImage = null, bool $removeImage = false)
+    public function updateCoverImage(Bookshelf $shelf, ?UploadedFile $coverImage, bool $removeImage = false)

     {
         $this->baseRepo->updateCoverImage($shelf, $coverImage, $removeImage);
     }
     {
         $this->baseRepo->updateCoverImage($shelf, $coverImage, $removeImage);
     }

diff --git a/tests/Entity/BookShelfTest.php b/tests/Entity/BookShelfTest.php
index b447612031d69c9cbcd2250c65b047617420e017..a318ebe24e5be48cd29b7559c25679db6d02e44a 100644 (file)
--- a/tests/Entity/BookShelfTest.php
+++ b/tests/Entity/BookShelfTest.php
@@ -100,7 +100,7 @@ class BookShelfTest extends TestCase
         $lastImage = Image::query()->orderByDesc('id')->firstOrFail();
         $shelf = Bookshelf::query()->where('name', '=', $shelfInfo['name'])->first();
         $this->assertDatabaseHas('bookshelves', [
         $lastImage = Image::query()->orderByDesc('id')->firstOrFail();
         $shelf = Bookshelf::query()->where('name', '=', $shelfInfo['name'])->first();
         $this->assertDatabaseHas('bookshelves', [

-            'id' => $shelf,
+            'id' => $shelf->id,

             'image_id' => $lastImage->id,
         ]);
         $this->assertEquals($lastImage->id, $shelf->cover->id);
             'image_id' => $lastImage->id,
         ]);
         $this->assertEquals($lastImage->id, $shelf->cover->id);