Merge pull request #52 from bookboon/hotfix/thumbnailresolver

Centralise thumbnailResolver
bookboon · Feb 21, 2020 · 528c66f · 528c66f
2 parents 68315d0 + dabc55b
commit 528c66f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 36 deletions.
diff --git a/src/Entity/Author.php b/src/Entity/Author.php
@@ -94,18 +94,7 @@ public function getProfileImage() {
      */
     public function getThumbnail(int $size = 210)
     {
-        $thumbs = [];
-        foreach ($this->safeGet('thumbnail', []) as $thumb) {
-            $thumbs[$thumb['width']] = $thumb['_link'];
-        }
-
-        $sizes = array_keys($thumbs);
-        while (true) {
-            $thumbSize = array_shift($sizes);
-            if ((int) $size <= (int) $thumbSize || count($sizes) === 0) {
-                return $thumbs[$thumbSize];
-            }
-        }
+        return $this->thumbnailResolver($this->safeGet('thumbnail', []), $size);
     }
 
     /**

diff --git a/src/Entity/Book.php b/src/Entity/Book.php
@@ -293,18 +293,7 @@ public function getIsbn()
      */
     public function getThumbnail(int $size = 210)
     {
-        $thumbs = [];
-        foreach ($this->safeGet('thumbnail', []) as $thumb) {
-            $thumbs[$thumb['width']] = $thumb['_link'];
-        }
-
-        $sizes = array_keys($thumbs);
-        while (true) {
-            $thumbSize = array_shift($sizes);
-            if ((int) $size <= (int) $thumbSize || count($sizes) === 0) {
-                return $thumbs[$thumbSize];
-            }
-        }
+        return $this->thumbnailResolver($this->safeGet('thumbnail', []), $size);
     }
 
     /**

diff --git a/src/Entity/Entity.php b/src/Entity/Entity.php
@@ -106,6 +106,26 @@ public static function isValidUUID(string $uuid) : bool
         return preg_match('/^([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}$/', $uuid) == true;
     }
 
+    protected function thumbnailResolver($thumbnails, $size) : string
+    {
+        if (false === is_array($thumbnails) || count($thumbnails) === 0) {
+            return '';
+        }
+
+        $thumbs = [];
+        foreach ($thumbnails as $thumb) {
+            $thumbs[$thumb['width']] = $thumb['_link'];
+        }
+
+        $sizes = array_keys($thumbs);
+        while (true) {
+            $thumbSize = array_shift($sizes);
+            if ((int) $size <= (int) $thumbSize || count($sizes) === 0) {
+                return $thumbs[$thumbSize];
+            }
+        }
+    }
+
     public function jsonSerialize()
     {
         return $this->getData();

diff --git a/src/Entity/Journey.php b/src/Entity/Journey.php
@@ -109,18 +109,7 @@ public function getPublished() : string
      */
     public function getThumbnail(int $size = 210)
     {
-        $thumbs = [];
-        foreach ($this->safeGet('thumbnail', []) as $thumb) {
-            $thumbs[$thumb['width']] = $thumb['_link'];
-        }
-
-        $sizes = array_keys($thumbs);
-        while (true) {
-            $thumbSize = array_shift($sizes);
-            if ((int) $size <= (int) $thumbSize || count($sizes) === 0) {
-                return $thumbs[$thumbSize];
-            }
-        }
+        return $this->thumbnailResolver($this->safeGet('thumbnail', []), $size);
     }
 
     /**