mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-08-23 14:02:47 +02:00
Code Issues Releases Wiki Activity

Fix merging diffs

Browse Source
This commit is contained in:
Oliver Vogel
2024-01-15 09:48:23 +01:00
parent 66efef9ef0
commit a00138403a
13 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Drivers/Gd/Modifiers/BlendTransparencyModifier.php
View File

@@ -5,11 +5,12 @@ namespace Intervention\Image\Drivers\Gd\Modifiers;
use Intervention\Image\Drivers\DriverSpecialized;
use Intervention\Image\Drivers\Gd\Cloner;
use Intervention\Image\Interfaces\ImageInterface;
use Intervention\Image\Interfaces\ModifierInterface;
/**
* @property mixed $color
*/
class BlendTransparencyModifier extends DriverSpecialized
class BlendTransparencyModifier extends DriverSpecialized implements ModifierInterface
{
public function apply(ImageInterface $image): ImageInterface
{

3
src/Drivers/Gd/Modifiers/ContainModifier.php
View File

@@ -10,6 +10,7 @@ use Intervention\Image\Drivers\Gd\Cloner;
use Intervention\Image\Interfaces\ColorInterface;
use Intervention\Image\Interfaces\FrameInterface;
use Intervention\Image\Interfaces\ImageInterface;
use Intervention\Image\Interfaces\ModifierInterface;
use Intervention\Image\Interfaces\SizeInterface;
/**
@@ -20,7 +21,7 @@ use Intervention\Image\Interfaces\SizeInterface;
* @property mixed $background
* @property string $position
*/
class ContainModifier extends DriverSpecialized
class ContainModifier extends DriverSpecialized implements ModifierInterface
{
public function apply(ImageInterface $image): ImageInterface
{

3
src/Drivers/Gd/Modifiers/CoverModifier.php
View File

@@ -6,13 +6,14 @@ use Intervention\Image\Drivers\DriverSpecialized;
use Intervention\Image\Drivers\Gd\Cloner;
use Intervention\Image\Interfaces\FrameInterface;
use Intervention\Image\Interfaces\ImageInterface;
use Intervention\Image\Interfaces\ModifierInterface;
use Intervention\Image\Interfaces\SizeInterface;
/**
* @method SizeInterface getResizeSize(ImageInterface $image)
* @method SizeInterface getCropSize(ImageInterface $image)
*/
class CoverModifier extends DriverSpecialized
class CoverModifier extends DriverSpecialized implements ModifierInterface
{
public function apply(ImageInterface $image): ImageInterface
{

3
src/Drivers/Gd/Modifiers/CropModifier.php
View File

@@ -6,6 +6,7 @@ use Intervention\Image\Drivers\DriverSpecialized;
use Intervention\Image\Drivers\Gd\Cloner;
use Intervention\Image\Interfaces\FrameInterface;
use Intervention\Image\Interfaces\ImageInterface;
use Intervention\Image\Interfaces\ModifierInterface;
use Intervention\Image\Interfaces\SizeInterface;
/**
@@ -14,7 +15,7 @@ use Intervention\Image\Interfaces\SizeInterface;
* @property int $offset_y
* @property mixed $background
*/
class CropModifier extends DriverSpecialized
class CropModifier extends DriverSpecialized implements ModifierInterface
{
public function apply(ImageInterface $image): ImageInterface
{

3
src/Drivers/Gd/Modifiers/QuantizeColorsModifier.php
View File

@@ -6,12 +6,13 @@ use Intervention\Image\Drivers\DriverSpecialized;
use Intervention\Image\Drivers\Gd\Cloner;
use Intervention\Image\Exceptions\InputException;
use Intervention\Image\Interfaces\ImageInterface;
use Intervention\Image\Interfaces\ModifierInterface;
/**
* @property int $limit
* @property mixed $background
*/
class QuantizeColorsModifier extends DriverSpecialized
class QuantizeColorsModifier extends DriverSpecialized implements ModifierInterface
{
public function apply(ImageInterface $image): ImageInterface
{

3
src/Drivers/Gd/Modifiers/ResizeCanvasModifier.php
View File

@@ -10,13 +10,14 @@ use Intervention\Image\Drivers\Gd\Cloner;
use Intervention\Image\Interfaces\ColorInterface;
use Intervention\Image\Interfaces\FrameInterface;
use Intervention\Image\Interfaces\ImageInterface;
use Intervention\Image\Interfaces\ModifierInterface;
use Intervention\Image\Interfaces\SizeInterface;
/**
* @method SizeInterface cropSize(ImageInterface $image)
* @property mixed $background
*/
class ResizeCanvasModifier extends DriverSpecialized
class ResizeCanvasModifier extends DriverSpecialized implements ModifierInterface
{
public function apply(ImageInterface $image): ImageInterface
{

3
src/Drivers/Gd/Modifiers/ResizeModifier.php
View File

@@ -6,13 +6,14 @@ use Intervention\Image\Drivers\DriverSpecialized;
use Intervention\Image\Drivers\Gd\Cloner;
use Intervention\Image\Interfaces\FrameInterface;
use Intervention\Image\Interfaces\ImageInterface;
use Intervention\Image\Interfaces\ModifierInterface;
use Intervention\Image\Interfaces\SizeInterface;
/**
* @property null|int $width
* @property null|int $height
*/
class ResizeModifier extends DriverSpecialized
class ResizeModifier extends DriverSpecialized implements ModifierInterface
{
public function apply(ImageInterface $image): ImageInterface
{

3
src/Drivers/Gd/Modifiers/RotateModifier.php
View File

@@ -11,12 +11,13 @@ use Intervention\Image\Geometry\Rectangle;
use Intervention\Image\Interfaces\ColorInterface;
use Intervention\Image\Interfaces\FrameInterface;
use Intervention\Image\Interfaces\ImageInterface;
use Intervention\Image\Interfaces\ModifierInterface;
/**
* @method mixed rotationAngle()
* @property mixed $background
*/
class RotateModifier extends DriverSpecialized
class RotateModifier extends DriverSpecialized implements ModifierInterface
{
public function apply(ImageInterface $image): ImageInterface
{

5
src/Drivers/Gd/Modifiers/SliceAnimationModifier.php
View File

@@ -2,14 +2,15 @@
namespace Intervention\Image\Drivers\Gd\Modifiers;
use Intervention\Image\Drivers\DriverSpecializedModifier;
use Intervention\Image\Drivers\DriverSpecialized;
use Intervention\Image\Interfaces\ImageInterface;
use Intervention\Image\Interfaces\ModifierInterface;
/**
* @property int $offset
* @property null|int $length
*/
class SliceAnimationModifier extends DriverSpecializedModifier
class SliceAnimationModifier extends DriverSpecialized implements ModifierInterface
{
public function apply(ImageInterface $image): ImageInterface
{

3
src/Drivers/Imagick/Modifiers/BlendTransparencyModifier.php
View File

@@ -5,11 +5,12 @@ namespace Intervention\Image\Drivers\Imagick\Modifiers;
use Imagick;
use Intervention\Image\Drivers\DriverSpecialized;
use Intervention\Image\Interfaces\ImageInterface;
use Intervention\Image\Interfaces\ModifierInterface;
/**
* @property mixed $color
*/
class BlendTransparencyModifier extends DriverSpecialized
class BlendTransparencyModifier extends DriverSpecialized implements ModifierInterface
{
public function apply(ImageInterface $image): ImageInterface
{

5
src/Drivers/Imagick/Modifiers/SliceAnimationModifier.php
View File

@@ -2,14 +2,15 @@
namespace Intervention\Image\Drivers\Imagick\Modifiers;
use Intervention\Image\Drivers\DriverSpecializedModifier;
use Intervention\Image\Drivers\DriverSpecialized;
use Intervention\Image\Interfaces\ImageInterface;
use Intervention\Image\Interfaces\ModifierInterface;
/**
* @property int $offset
* @property null|int $length
*/
class SliceAnimationModifier extends DriverSpecializedModifier
class SliceAnimationModifier extends DriverSpecialized implements ModifierInterface
{
public function apply(ImageInterface $image): ImageInterface
{

7
src/Encoders/HeicEncoder.php
View File

@@ -2,9 +2,8 @@
namespace Intervention\Image\Encoders;
class HeicEncoder extends AbstractEncoder
use Intervention\Image\Interfaces\SpecializableInterface;
class HeicEncoder extends AbstractEncoder implements SpecializableInterface
{
public function __construct(public int $quality = 75)
{
}
}

4
src/Image.php
View File

@@ -985,9 +985,9 @@ final class Image implements ImageInterface
*
* @see ImageInterface::toHeic()
*/
public function toHeic(int $quality = 75): EncodedImageInterface
public function toHeic(mixed ...$options): EncodedImageInterface
{
return $this->encode(new HeicEncoder($quality));
return $this->encode(new HeicEncoder(...$options));
}
/**