Skip to content

Commit

Permalink
Deprecate mediaType argument in EncodedImage::class
Browse files Browse the repository at this point in the history
  • Loading branch information
olivervogel committed Jul 21, 2024
1 parent e8001ac commit 02295f1
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/Drivers/Gd/Encoders/AvifEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ public function encode(ImageInterface $image): EncodedImage
imageavif($gd, null, $this->quality);
});

return new EncodedImage($data, 'image/avif');
return new EncodedImage($data);
}
}
2 changes: 1 addition & 1 deletion src/Drivers/Gd/Encoders/BmpEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ public function encode(ImageInterface $image): EncodedImage
imagebmp($image->core()->native(), null, false);
});

return new EncodedImage($data, 'image/bmp');
return new EncodedImage($data);
}
}
4 changes: 2 additions & 2 deletions src/Drivers/Gd/Encoders/GifEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function encode(ImageInterface $image): EncodedImage
imageinterlace($gd, false);
});

return new EncodedImage($data, 'image/gif');
return new EncodedImage($data);
}

/**
Expand All @@ -55,6 +55,6 @@ protected function encodeAnimated(ImageInterface $image): EncodedImage
throw new EncoderException($e->getMessage(), $e->getCode(), $e);
}

return new EncodedImage($builder->encode(), 'image/gif');
return new EncodedImage($builder->encode());
}
}
2 changes: 1 addition & 1 deletion src/Drivers/Gd/Encoders/JpegEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ public function encode(ImageInterface $image): EncodedImage
imagejpeg($output, null, $this->quality);
});

return new EncodedImage($data, 'image/jpeg');
return new EncodedImage($data);
}
}
2 changes: 1 addition & 1 deletion src/Drivers/Gd/Encoders/PngEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ public function encode(ImageInterface $image): EncodedImage
imageinterlace($gd, false);
});

return new EncodedImage($data, 'image/png');
return new EncodedImage($data);
}
}
2 changes: 1 addition & 1 deletion src/Drivers/Gd/Encoders/WebpEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ public function encode(ImageInterface $image): EncodedImage
imagewebp($image->core()->native(), null, $quality);
});

return new EncodedImage($data, 'image/webp');
return new EncodedImage($data);
}
}
2 changes: 1 addition & 1 deletion src/Drivers/Imagick/Encoders/AvifEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ public function encode(ImageInterface $image): EncodedImage
$imagick->setCompressionQuality($this->quality);
$imagick->setImageCompressionQuality($this->quality);

return new EncodedImage($imagick->getImagesBlob(), 'image/avif');
return new EncodedImage($imagick->getImagesBlob());
}
}
2 changes: 1 addition & 1 deletion src/Drivers/Imagick/Encoders/BmpEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ public function encode(ImageInterface $image): EncodedImage
$imagick->setCompression($compression);
$imagick->setImageCompression($compression);

return new EncodedImage($imagick->getImagesBlob(), 'image/bmp');
return new EncodedImage($imagick->getImagesBlob());
}
}
2 changes: 1 addition & 1 deletion src/Drivers/Imagick/Encoders/GifEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ public function encode(ImageInterface $image): EncodedImage
$imagick->setInterlaceScheme(Imagick::INTERLACE_LINE);
}

return new EncodedImage($imagick->getImagesBlob(), 'image/gif');
return new EncodedImage($imagick->getImagesBlob());
}
}
2 changes: 1 addition & 1 deletion src/Drivers/Imagick/Encoders/HeicEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
$imagick->setCompressionQuality($this->quality);
$imagick->setImageCompressionQuality($this->quality);

return new EncodedImage($imagick->getImagesBlob(), 'image/heic');
return new EncodedImage($imagick->getImagesBlob());
}
}
2 changes: 1 addition & 1 deletion src/Drivers/Imagick/Encoders/Jpeg2000Encoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
$imagick->setCompressionQuality($this->quality);
$imagick->setImageCompressionQuality($this->quality);

return new EncodedImage($imagick->getImagesBlob(), 'image/jp2');
return new EncodedImage($imagick->getImagesBlob());
}
}
2 changes: 1 addition & 1 deletion src/Drivers/Imagick/Encoders/JpegEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ public function encode(ImageInterface $image): EncodedImage
$imagick->setInterlaceScheme(Imagick::INTERLACE_PLANE);
}

return new EncodedImage($imagick->getImagesBlob(), 'image/jpeg');
return new EncodedImage($imagick->getImagesBlob());
}
}
2 changes: 1 addition & 1 deletion src/Drivers/Imagick/Encoders/PngEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ public function encode(ImageInterface $image): EncodedImage
$imagick->setInterlaceScheme(Imagick::INTERLACE_LINE);
}

return new EncodedImage($imagick->getImagesBlob(), 'image/png');
return new EncodedImage($imagick->getImagesBlob());
}
}
2 changes: 1 addition & 1 deletion src/Drivers/Imagick/Encoders/TiffEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
$imagick->setCompressionQuality($this->quality);
$imagick->setImageCompressionQuality($this->quality);

return new EncodedImage($imagick->getImagesBlob(), 'image/tiff');
return new EncodedImage($imagick->getImagesBlob());
}
}
2 changes: 1 addition & 1 deletion src/Drivers/Imagick/Encoders/WebpEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ public function encode(ImageInterface $image): EncodedImage
$imagick->setImageCompression($compression);
$imagick->setImageCompressionQuality($this->quality);

return new EncodedImage($imagick->getImagesBlob(), 'image/webp');
return new EncodedImage($imagick->getImagesBlob());
}
}
16 changes: 16 additions & 0 deletions src/EncodedImage.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,20 @@

class EncodedImage extends File implements EncodedImageInterface
{
/**
* Create new instance
*
* @param mixed $data
* @param string $mediaType deprecated
*/
public function __construct(
mixed $data,
protected string $mediaType = 'application/octet-stream'
) {
parent::__construct($data);

if (count(func_get_args()) > 1) {
trigger_error('Argument #2 ($mediaType) has been deprecated as of version 3.8.0.', E_USER_DEPRECATED);
}
}
}

0 comments on commit 02295f1

Please sign in to comment.