From b5281bc9ca9adb6fffc9fcba80a95b0d43e45bdd Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 26 Mar 2022 20:38:03 +0000
Subject: [PATCH] Fixed tests, applied StyleCI changes

---
 app/Actions/WebhookFormatter.php       | 15 ++++++++-------
 app/Entities/Models/PageRevision.php   |  2 +-
 app/Uploads/ImageService.php           |  5 +++--
 tests/Actions/WebhookFormatTesting.php |  7 ++++---
 tests/ThemeTest.php                    |  2 +-
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/Actions/WebhookFormatter.php b/app/Actions/WebhookFormatter.php
index 48b1a3929..5b64a747a 100644
--- a/app/Actions/WebhookFormatter.php
+++ b/app/Actions/WebhookFormatter.php
@@ -60,13 +60,13 @@ class WebhookFormatter
 
     /**
      * @param callable(string, Model):bool $condition
-     * @param callable(Model):void $format
+     * @param callable(Model):void         $format
      */
     public function addModelFormatter(callable $condition, callable $format): void
     {
         $this->modelFormatters[] = [
             'condition' => $condition,
-            'format' => $format,
+            'format'    => $format,
         ];
     }
 
@@ -74,14 +74,14 @@ class WebhookFormatter
     {
         // Load entity owner, creator, updater details
         $this->addModelFormatter(
-            fn($event, $model) => ($model instanceof Entity),
-            fn($model) => $model->load(['ownedBy', 'createdBy', 'updatedBy'])
+            fn ($event, $model) => ($model instanceof Entity),
+            fn ($model) => $model->load(['ownedBy', 'createdBy', 'updatedBy'])
         );
 
         // Load revision detail for page update and create events
         $this->addModelFormatter(
-            fn($event, $model) => ($model instanceof Page && ($event === ActivityType::PAGE_CREATE || $event === ActivityType::PAGE_UPDATE)),
-            fn($model) => $model->load('currentRevision')
+            fn ($event, $model) => ($model instanceof Page && ($event === ActivityType::PAGE_CREATE || $event === ActivityType::PAGE_UPDATE)),
+            fn ($model) => $model->load('currentRevision')
         );
     }
 
@@ -118,6 +118,7 @@ class WebhookFormatter
     {
         $instance = new static($event, $webhook, $detail, $initiator, $initiatedTime);
         $instance->addDefaultModelFormatters();
+
         return $instance;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Entities/Models/PageRevision.php b/app/Entities/Models/PageRevision.php
index aacc94586..800e5e7f2 100644
--- a/app/Entities/Models/PageRevision.php
+++ b/app/Entities/Models/PageRevision.php
@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 /**
  * Class PageRevision.
  *
- * @property mixed $id
+ * @property mixed  $id
  * @property int    $page_id
  * @property string $slug
  * @property string $book_slug
diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index ee414aacb..ca0db997b 100644
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -338,7 +338,7 @@ class ImageService
      * can be used (At least when created using binary string data) so we need to do some
      * implementation on our side to use the original image data.
      * Bulk of logic taken from: https://github.com/Intervention/image/blob/b734a4988b2148e7d10364b0609978a88d277536/src/Intervention/Image/Commands/OrientateCommand.php
-     * Copyright (c) Oliver Vogel, MIT License
+     * Copyright (c) Oliver Vogel, MIT License.
      */
     protected function orientImageToOriginalExif(InterventionImage $image, string $originalData): void
     {
@@ -347,7 +347,8 @@ class ImageService
         }
 
         $stream = Utils::streamFor($originalData)->detach();
-        $orientation = exif_read_data($stream)['Orientation'] ?? null;
+        $exif = @exif_read_data($stream);
+        $orientation = $exif ? ($exif['Orientation'] ?? null) : null;
 
         switch ($orientation) {
             case 2:
diff --git a/tests/Actions/WebhookFormatTesting.php b/tests/Actions/WebhookFormatTesting.php
index 56a569ca9..4e9ba5e47 100644
--- a/tests/Actions/WebhookFormatTesting.php
+++ b/tests/Actions/WebhookFormatTesting.php
@@ -16,9 +16,9 @@ class WebhookFormatTesting extends TestCase
     public function test_entity_events_show_related_user_info()
     {
         $events = [
-            ActivityType::BOOK_UPDATE => Book::query()->first(),
+            ActivityType::BOOK_UPDATE    => Book::query()->first(),
             ActivityType::CHAPTER_CREATE => Chapter::query()->first(),
-            ActivityType::PAGE_MOVE => Page::query()->first(),
+            ActivityType::PAGE_MOVE      => Page::query()->first(),
         ];
 
         foreach ($events as $event => $entity) {
@@ -47,6 +47,7 @@ class WebhookFormatTesting extends TestCase
         $webhook = Webhook::factory()->make();
         $user = $this->getEditor();
         $formatter = WebhookFormatter::getDefault($event, $webhook, $detail, $user, time());
+
         return $formatter->format();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/ThemeTest.php b/tests/ThemeTest.php
index 775be92fc..cad2369f8 100644
--- a/tests/ThemeTest.php
+++ b/tests/ThemeTest.php
@@ -186,7 +186,7 @@ class ThemeTest extends TestCase
 
         dispatch((new DispatchWebhookJob($webhook, $event, $detail)));
 
-        $this->assertCount(3, $args);
+        $this->assertCount(5, $args);
         $this->assertEquals($event, $args[0]);
         $this->assertEquals($webhook->id, $args[1]->id);
         $this->assertEquals($detail->id, $args[2]->id);