Move media type detection methods to abstract class

src/Drivers/Gd/Decoders/AbstractDecoder.php

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Intervention\Image\Drivers\Gd\Decoders;
+
+use Intervention\Image\Drivers\AbstractDecoder as GenericAbstractDecoder;
+use Intervention\Image\Exceptions\DecoderException;
+
+abstract class AbstractDecoder extends GenericAbstractDecoder
+{
+    /**
+     * Return media (mime) type of the file at given file path
+     *
+     * @param string $filepath
+     * @return string
+     */
+    protected function getMediaTypeByFilePath(string $filepath): string
+    {
+        $info = getimagesize($filepath);
+
+        if (!is_array($info)) {
+            throw new DecoderException('Unable to decode input');
+        }
+
+        if (!array_key_exists('mime', $info)) {
+            throw new DecoderException('Unable to decode input');
+        }
+
+        return $info['mime'];
+    }
+
+    /**
+     * Return media (mime) type of the given image data
+     *
+     * @param string $filepath
+     * @return string
+     */
+    protected function getMediaTypeByBinary(string $data): string
+    {
+        $info = getimagesizefromstring($data);
+
+        if (!is_array($info)) {
+            throw new DecoderException('Unable to decode input');
+        }
+
+        if (!array_key_exists('mime', $info)) {
+            throw new DecoderException('Unable to decode input');
+        }
+
+        return $info['mime'];
+    }
+}

src/Drivers/Gd/Decoders/BinaryImageDecoder.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Intervention\Image\Drivers\Gd\Decoders;
 
-use Intervention\Image\Drivers\AbstractDecoder;
 use Intervention\Image\Drivers\Gd\Frame;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\DecoderInterface;
@@ -68,9 +67,12 @@ class BinaryImageDecoder extends AbstractDecoder implements DecoderInterface
             $this->extractExifData($input)
         );
 
+        try {
             // set mediaType on origin
-        if ($info = getimagesizefromstring($input)) {
+            $image->origin()->setMediaType(
-            $image->origin()->setMediaType($info['mime']);
+                $this->getMediaTypeByBinary($input)
+            );
+        } catch (DecoderException) {
         }
 
         // adjust image orientation

src/Drivers/Gd/Decoders/FilePathImageDecoder.php

@@ -37,8 +37,9 @@ class FilePathImageDecoder extends GdImageDecoder implements DecoderInterface
         // detect media (mime) type
         $mediaType = $this->getMediaTypeByFilePath($input);
 
-        // gif files might be animated and therefore cannot be handled by the standard GD decoder.
         $image = match ($mediaType) {
+            // gif files might be animated and therefore cannot
+            // be handled by the standard GD decoder.
             'image/gif' => $this->decodeGif($input),
             default => parent::decode(match ($mediaType) {
                 'image/jpeg', 'image/jpg', 'image/pjpeg' => imagecreatefromjpeg($input),
@@ -69,25 +70,4 @@ class FilePathImageDecoder extends GdImageDecoder implements DecoderInterface
 
         return $image;
     }
-
-    /**
-     * Return media (mime) type of the file at given file path
-     *
-     * @param string $filepath
-     * @return string
-     */
-    private function getMediaTypeByFilePath(string $filepath): string
-    {
-        $info = getimagesize($filepath);
-
-        if (!is_array($info)) {
-            throw new DecoderException('Unable to decode input');
-        }
-
-        if (!array_key_exists('mime', $info)) {
-            throw new DecoderException('Unable to decode input');
-        }
-
-        return $info['mime'];
-    }
 }

src/Drivers/Gd/Decoders/GdImageDecoder.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Intervention\Image\Drivers\Gd\Decoders;
 
 use GdImage;
-use Intervention\Image\Drivers\AbstractDecoder;
 use Intervention\Image\Drivers\Gd\Core;
 use Intervention\Image\Drivers\Gd\Driver;
 use Intervention\Image\Drivers\Gd\Frame;

tests/Drivers/Gd/Decoders/AbstractDecoderTest.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Intervention\Image\Tests\Drivers\Gd\Decoders;
+
+use Intervention\Image\Drivers\Gd\Decoders\AbstractDecoder;
+use Intervention\Image\Tests\TestCase;
+use Mockery;
+
+class AbstractDecoderTest extends TestCase
+{
+    public function testGetMediaTypeFromFilePath(): void
+    {
+        $decoder = Mockery::mock(AbstractDecoder::class)->makePartial();
+        $this->assertEquals('image/jpeg', $decoder->getMediaTypeByFilePath($this->getTestImagePath('test.jpg')));
+    }
+
+    public function testGetMediaTypeFromFileBinary(): void
+    {
+        $decoder = Mockery::mock(AbstractDecoder::class)->makePartial();
+        $this->assertEquals('image/jpeg', $decoder->getMediaTypeByBinary($this->getTestImageData('test.jpg')));
+    }
+}