Pass mime type manually to avoid finfo dependency

Intervention · Oct 6, 2024 · 8cf0405 · 8cf0405
1 parent a09c7c9
commit 8cf0405
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 34 deletions.
diff --git a/src/Drivers/AbstractEncoder.php b/src/Drivers/AbstractEncoder.php
@@ -31,14 +31,15 @@ public function encode(ImageInterface $image): EncodedImageInterface
      * Build new file pointer, run callback with it and return result as encoded image
      *
      * @param callable $callback
+     * @param null|string $mediaType
      * @throws RuntimeException
      * @return EncodedImage
      */
-    protected function createEncodedImage(callable $callback): EncodedImage
+    protected function createEncodedImage(callable $callback, ?string $mediaType = null): EncodedImage
     {
         $pointer = $this->buildFilePointer();
         $callback($pointer);
 
-        return new EncodedImage($pointer);
+        return is_string($mediaType) ? new EncodedImage($pointer, $mediaType) : new EncodedImage($pointer);
     }
 }
diff --git a/src/Drivers/Gd/Encoders/AvifEncoder.php b/src/Drivers/Gd/Encoders/AvifEncoder.php
@@ -20,6 +20,6 @@ public function encode(ImageInterface $image): EncodedImage
     {
         return $this->createEncodedImage(function ($pointer) use ($image) {
             imageavif($image->core()->native(), $pointer, $this->quality);
-        });
+        }, 'image/aviv');
     }
 }
diff --git a/src/Drivers/Gd/Encoders/BmpEncoder.php b/src/Drivers/Gd/Encoders/BmpEncoder.php
@@ -20,6 +20,6 @@ public function encode(ImageInterface $image): EncodedImage
     {
         return $this->createEncodedImage(function ($pointer) use ($image) {
             imagebmp($image->core()->native(), $pointer, false);
-        });
+        }, 'image/bmp');
     }
 }
diff --git a/src/Drivers/Gd/Encoders/GifEncoder.php b/src/Drivers/Gd/Encoders/GifEncoder.php
@@ -32,7 +32,7 @@ public function encode(ImageInterface $image): EncodedImage
         return $this->createEncodedImage(function ($pointer) use ($gd) {
             imageinterlace($gd, $this->interlaced);
             imagegif($gd, $pointer);
-        });
+        }, 'image/gif');
     }
 
     /**
@@ -56,7 +56,7 @@ protected function encodeAnimated(ImageInterface $image): EncodedImage
 
             $builder->setLoops($image->loops());
 
-            return new EncodedImage($builder->encode());
+            return new EncodedImage($builder->encode(), 'image/gif');
         } catch (Exception $e) {
             throw new EncoderException($e->getMessage(), $e->getCode(), $e);
         }

diff --git a/src/Drivers/Gd/Encoders/JpegEncoder.php b/src/Drivers/Gd/Encoders/JpegEncoder.php
@@ -31,6 +31,6 @@ public function encode(ImageInterface $image): EncodedImage
         return $this->createEncodedImage(function ($pointer) use ($output) {
             imageinterlace($output, $this->progressive);
             imagejpeg($output, $pointer, $this->quality);
-        });
+        }, 'image/jpeg');
     }
 }
diff --git a/src/Drivers/Gd/Encoders/PngEncoder.php b/src/Drivers/Gd/Encoders/PngEncoder.php
@@ -28,7 +28,7 @@ public function encode(ImageInterface $image): EncodedImage
         return $this->createEncodedImage(function ($pointer) use ($output) {
             imageinterlace($output, $this->interlaced);
             imagepng($output, $pointer, -1);
-        });
+        }, 'image/png');
     }
 
     /**

diff --git a/src/Drivers/Gd/Encoders/WebpEncoder.php b/src/Drivers/Gd/Encoders/WebpEncoder.php
@@ -22,6 +22,6 @@ public function encode(ImageInterface $image): EncodedImage
 
         return $this->createEncodedImage(function ($pointer) use ($image, $quality) {
             imagewebp($image->core()->native(), $pointer, $quality);
-        });
+        }, 'image/webp');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/AvifEncoder.php b/src/Drivers/Imagick/Encoders/AvifEncoder.php
@@ -26,6 +26,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setCompressionQuality($this->quality);
         $imagick->setImageCompressionQuality($this->quality);
 
-        return new EncodedImage($imagick->getImagesBlob());
+        return new EncodedImage($imagick->getImagesBlob(), 'image/avif');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/BmpEncoder.php b/src/Drivers/Imagick/Encoders/BmpEncoder.php
@@ -24,6 +24,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setCompression($compression);
         $imagick->setImageCompression($compression);
 
-        return new EncodedImage($imagick->getImagesBlob());
+        return new EncodedImage($imagick->getImagesBlob(), 'image/bmp');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/GifEncoder.php b/src/Drivers/Imagick/Encoders/GifEncoder.php
@@ -29,6 +29,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
             $imagick->setInterlaceScheme(Imagick::INTERLACE_LINE);
         }
 
-        return new EncodedImage($imagick->getImagesBlob());
+        return new EncodedImage($imagick->getImagesBlob(), 'image/gif');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/HeicEncoder.php b/src/Drivers/Imagick/Encoders/HeicEncoder.php
@@ -22,6 +22,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setCompressionQuality($this->quality);
         $imagick->setImageCompressionQuality($this->quality);
 
-        return new EncodedImage($imagick->getImagesBlob());
+        return new EncodedImage($imagick->getImagesBlob(), 'image/heic');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/Jpeg2000Encoder.php b/src/Drivers/Imagick/Encoders/Jpeg2000Encoder.php
@@ -28,6 +28,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setCompressionQuality($this->quality);
         $imagick->setImageCompressionQuality($this->quality);
 
-        return new EncodedImage($imagick->getImagesBlob());
+        return new EncodedImage($imagick->getImagesBlob(), 'image/jp2');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/JpegEncoder.php b/src/Drivers/Imagick/Encoders/JpegEncoder.php
@@ -45,6 +45,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
             $imagick->setInterlaceScheme(Imagick::INTERLACE_PLANE);
         }
 
-        return new EncodedImage($imagick->getImagesBlob());
+        return new EncodedImage($imagick->getImagesBlob(), 'image/jpeg');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/PngEncoder.php b/src/Drivers/Imagick/Encoders/PngEncoder.php
@@ -41,6 +41,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
             $output->setInterlaceScheme(Imagick::INTERLACE_LINE);
         }
 
-        return new EncodedImage($output->getImagesBlob());
+        return new EncodedImage($output->getImagesBlob(), 'image/png');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/TiffEncoder.php b/src/Drivers/Imagick/Encoders/TiffEncoder.php
@@ -24,6 +24,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setCompressionQuality($this->quality);
         $imagick->setImageCompressionQuality($this->quality);
 
-        return new EncodedImage($imagick->getImagesBlob());
+        return new EncodedImage($imagick->getImagesBlob(), 'image/tiff');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/WebpEncoder.php b/src/Drivers/Imagick/Encoders/WebpEncoder.php
@@ -32,6 +32,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setImageCompression($compression);
         $imagick->setImageCompressionQuality($this->quality);
 
-        return new EncodedImage($imagick->getImagesBlob());
+        return new EncodedImage($imagick->getImagesBlob(), 'image/webp');
     }
 }
diff --git a/src/EncodedImage.php b/src/EncodedImage.php
@@ -12,16 +12,12 @@ class EncodedImage extends File implements EncodedImageInterface
      * Create new instance
      *
      * @param string|resource $data
-     * @param string $mediaType Deprecated parameter, will be removed
+     * @param string $mediaType
      */
     public function __construct(
         mixed $data,
-        protected string $mediaType = 'application/octet-stream' // deprecated
+        protected string $mediaType = 'application/octet-stream'
     ) {
-        if ($mediaType !== 'application/octet-stream') {
-            trigger_error('Parameter $mediaType for class' . self::class . ' is deprecated.', E_USER_DEPRECATED);
-        }
-
         parent::__construct($data);
     }
 
@@ -32,7 +28,7 @@ public function __construct(
      */
     public function mediaType(): string
     {
-        return mime_content_type($this->pointer);
+        return $this->mediaType;
     }
 
     /**

diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
@@ -105,10 +105,11 @@ protected function assertTransparency(ColorInterface $color)
 
     protected function assertMediaType(string|array $allowed, string|EncodedImage $input): void
     {
-        $detected = match (true) {
-            is_string($input) => (new EncodedImage($input))->mimetype(),
-            default => $input->mimetype(),
-        };
+        $pointer = fopen('php://temp', 'rw');
+        fputs($pointer, (string) $input);
+        rewind($pointer);
+        $detected = mime_content_type($pointer);
+        fclose($pointer);
 
         $allowed = is_string($allowed) ? [$allowed] : $allowed;
         $this->assertTrue(in_array($detected, $allowed));

diff --git a/tests/Unit/EncodedImageTest.php b/tests/Unit/EncodedImageTest.php
@@ -31,7 +31,7 @@ public function testSave(): void
     public function testToDataUri(): void
     {
         $image = new EncodedImage('foo');
-        $this->assertEquals('data:text/plain;base64,Zm9v', $image->toDataUri());
+        $this->assertEquals('data:application/octet-stream;base64,Zm9v', $image->toDataUri());
     }
 
     public function testToString(): void
@@ -43,18 +43,18 @@ public function testToString(): void
     public function testMediaType(): void
     {
         $image = new EncodedImage('foo');
-        $this->assertEquals('text/plain', $image->mediaType());
+        $this->assertEquals('application/octet-stream', $image->mediaType());
 
-        $image = new EncodedImage($this->getTestResourceData());
+        $image = new EncodedImage($this->getTestResourceData(), 'image/jpeg');
         $this->assertEquals('image/jpeg', $image->mediaType());
     }
 
     public function testMimetype(): void
     {
         $image = new EncodedImage('foo');
-        $this->assertEquals('text/plain', $image->mimetype());
+        $this->assertEquals('application/octet-stream', $image->mimetype());
 
-        $image = new EncodedImage($this->getTestResourceData());
+        $image = new EncodedImage($this->getTestResourceData(), 'image/jpeg');
         $this->assertEquals('image/jpeg', $image->mimetype());
     }
 }