mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-08-17 19:26:25 +02:00
Code Issues Releases Wiki Activity

Rename method

Browse Source 
Image::getFrame() to Image::frame()
This commit is contained in:
Oliver Vogel
2023-10-26 15:53:26 +02:00
parent 5e5d2dfe33
commit 43d37541db
21 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Drivers/Gd/Encoders/AvifEncoder.php
View File

@@ -17,7 +17,7 @@ class AvifEncoder extends AbstractEncoder implements EncoderInterface
public function encode(ImageInterface $image): EncodedImage public function encode(ImageInterface $image): EncodedImage
{ {
$data = $this->getBuffered(function () use ($image) { $data = $this->getBuffered(function () use ($image) {
imageavif($image->getFrame()->getCore(), null, $this->quality); imageavif($image->frame()->getCore(), null, $this->quality);
}); });
return new EncodedImage($data, 'image/avif'); return new EncodedImage($data, 'image/avif');

2
src/Drivers/Gd/Encoders/BmpEncoder.php
View File

@@ -12,7 +12,7 @@ class BmpEncoder extends AbstractEncoder implements EncoderInterface
public function encode(ImageInterface $image): EncodedImage public function encode(ImageInterface $image): EncodedImage
{ {
$data = $this->getBuffered(function () use ($image) { $data = $this->getBuffered(function () use ($image) {
imagebmp($image->getFrame()->getCore(), null, false); imagebmp($image->frame()->getCore(), null, false);
}); });
return new EncodedImage($data, 'image/bmp'); return new EncodedImage($data, 'image/bmp');

2
src/Drivers/Gd/Encoders/GifEncoder.php
View File

@@ -17,7 +17,7 @@ class GifEncoder extends AbstractEncoder implements EncoderInterface
} }
$data = $this->getBuffered(function () use ($image) { $data = $this->getBuffered(function () use ($image) {
imagegif($image->getFrame()->getCore()); imagegif($image->frame()->getCore());
}); });
return new EncodedImage($data, 'image/gif'); return new EncodedImage($data, 'image/gif');

2
src/Drivers/Gd/Encoders/JpegEncoder.php
View File

@@ -17,7 +17,7 @@ class JpegEncoder extends AbstractEncoder implements EncoderInterface
public function encode(ImageInterface $image): EncodedImage public function encode(ImageInterface $image): EncodedImage
{ {
$data = $this->getBuffered(function () use ($image) { $data = $this->getBuffered(function () use ($image) {
imagejpeg($image->getFrame()->getCore(), null, $this->quality); imagejpeg($image->frame()->getCore(), null, $this->quality);
}); });
return new EncodedImage($data, 'image/jpeg'); return new EncodedImage($data, 'image/jpeg');

2
src/Drivers/Gd/Encoders/PngEncoder.php
View File

@@ -12,7 +12,7 @@ class PngEncoder extends AbstractEncoder implements EncoderInterface
public function encode(ImageInterface $image): EncodedImage public function encode(ImageInterface $image): EncodedImage
{ {
$data = $this->getBuffered(function () use ($image) { $data = $this->getBuffered(function () use ($image) {
imagepng($image->getFrame()->getCore(), null, -1); imagepng($image->frame()->getCore(), null, -1);
}); });
return new EncodedImage($data, 'image/png'); return new EncodedImage($data, 'image/png');

2
src/Drivers/Gd/Encoders/WebpEncoder.php
View File

@@ -17,7 +17,7 @@ class WebpEncoder extends AbstractEncoder implements EncoderInterface
public function encode(ImageInterface $image): EncodedImage public function encode(ImageInterface $image): EncodedImage
{ {
$data = $this->getBuffered(function () use ($image) { $data = $this->getBuffered(function () use ($image) {
imagewebp($image->getFrame()->getCore(), null, $this->quality); imagewebp($image->frame()->getCore(), null, $this->quality);
}); });
return new EncodedImage($data, 'image/webp'); return new EncodedImage($data, 'image/webp');

8
src/Drivers/Gd/Image.php
View File

@@ -52,7 +52,7 @@ class Image extends AbstractImage implements ImageInterface, IteratorAggregate
return $this; return $this;
} }
public function getFrame(int $position = 0): FrameInterface public function frame(int $position = 0): FrameInterface
{ {
if ($frame = $this->frames->get($position)) { if ($frame = $this->frames->get($position)) {
return $frame; return $frame;
@@ -70,17 +70,17 @@ class Image extends AbstractImage implements ImageInterface, IteratorAggregate
public function width(): int public function width(): int
{ {
return imagesx($this->getFrame()->getCore()); return imagesx($this->frame()->getCore());
} }
public function height(): int public function height(): int
{ {
return imagesy($this->getFrame()->getCore()); return imagesy($this->frame()->getCore());
} }
public function pickColor(int $x, int $y, int $frame_key = 0): ?ColorInterface public function pickColor(int $x, int $y, int $frame_key = 0): ?ColorInterface
{ {
if ($frame = $this->getFrame($frame_key)) { if ($frame = $this->frame($frame_key)) {
return $this->integerToColor( return $this->integerToColor(
imagecolorat($frame->getCore(), $x, $y) imagecolorat($frame->getCore(), $x, $y)
); );

2
src/Drivers/Gd/ImageFactory.php
View File

@@ -47,7 +47,7 @@ class ImageFactory implements FactoryInterface
{ {
$this->frames->push( $this->frames->push(
$this->handleInput($source) $this->handleInput($source)
->getFrame() ->frame()
->setDelay($delay) ->setDelay($delay)
); );

2
src/Drivers/Gd/Modifiers/PlaceModifier.php
View File

@@ -33,7 +33,7 @@ class PlaceModifier implements ModifierInterface
imagealphablending($frame->getCore(), true); imagealphablending($frame->getCore(), true);
imagecopy( imagecopy(
$frame->getCore(), $frame->getCore(),
$watermark->getFrame()->getCore(), $watermark->frame()->getCore(),
$position->getX(), $position->getX(),
$position->getY(), $position->getY(),
0, 0,

2
src/Drivers/Imagick/Encoders/AvifEncoder.php
View File

@@ -15,7 +15,7 @@ class AvifEncoder extends AbstractEncoder implements EncoderInterface
$format = 'AVIF'; $format = 'AVIF';
$compression = Imagick::COMPRESSION_ZIP; $compression = Imagick::COMPRESSION_ZIP;
$imagick = $image->getFrame()->getCore(); $imagick = $image->frame()->getCore();
$imagick->setFormat($format); $imagick->setFormat($format);
$imagick->setImageFormat($format); $imagick->setImageFormat($format);
$imagick->setCompression($compression); $imagick->setCompression($compression);

2
src/Drivers/Imagick/Encoders/BmpEncoder.php
View File

@@ -15,7 +15,7 @@ class BmpEncoder extends AbstractEncoder implements EncoderInterface
$format = 'bmp'; $format = 'bmp';
$compression = Imagick::COMPRESSION_NO; $compression = Imagick::COMPRESSION_NO;
$imagick = $image->getFrame()->getCore(); $imagick = $image->frame()->getCore();
$imagick->setFormat($format); $imagick->setFormat($format);
$imagick->setImageFormat($format); $imagick->setImageFormat($format);
$imagick->setCompression($compression); $imagick->setCompression($compression);

2
src/Drivers/Imagick/Encoders/JpegEncoder.php
View File

@@ -20,7 +20,7 @@ class JpegEncoder extends AbstractEncoder implements EncoderInterface
$format = 'jpeg'; $format = 'jpeg';
$compression = Imagick::COMPRESSION_JPEG; $compression = Imagick::COMPRESSION_JPEG;
$imagick = $image->getFrame()->getCore(); $imagick = $image->frame()->getCore();
$imagick->setImageBackgroundColor('white'); $imagick->setImageBackgroundColor('white');
$imagick->setBackgroundColor('white'); $imagick->setBackgroundColor('white');
$imagick->setFormat($format); $imagick->setFormat($format);

2
src/Drivers/Imagick/Encoders/PngEncoder.php
View File

@@ -15,7 +15,7 @@ class PngEncoder extends AbstractEncoder implements EncoderInterface
$format = 'png'; $format = 'png';
$compression = Imagick::COMPRESSION_ZIP; $compression = Imagick::COMPRESSION_ZIP;
$imagick = $image->getFrame()->getCore(); $imagick = $image->frame()->getCore();
$imagick->setFormat($format); $imagick->setFormat($format);
$imagick->setImageFormat($format); $imagick->setImageFormat($format);
$imagick->setCompression($compression); $imagick->setCompression($compression);

2
src/Drivers/Imagick/Encoders/WebpEncoder.php
View File

@@ -21,7 +21,7 @@ class WebpEncoder extends AbstractEncoder implements EncoderInterface
$format = 'webp'; $format = 'webp';
$compression = Imagick::COMPRESSION_ZIP; $compression = Imagick::COMPRESSION_ZIP;
$imagick = $image->getFrame()->getCore(); $imagick = $image->frame()->getCore();
$imagick->setImageBackgroundColor(new ImagickPixel('transparent')); $imagick->setImageBackgroundColor(new ImagickPixel('transparent'));
$imagick = $imagick->mergeImageLayers(Imagick::LAYERMETHOD_MERGE); $imagick = $imagick->mergeImageLayers(Imagick::LAYERMETHOD_MERGE);

8
src/Drivers/Imagick/Image.php
View File

@@ -37,7 +37,7 @@ class Image extends AbstractImage implements ImageInterface, Iterator
return $this->imagick; return $this->imagick;
} }
public function getFrame(int $position = 0): FrameInterface public function frame(int $position = 0): FrameInterface
{ {
foreach ($this->imagick as $core) { foreach ($this->imagick as $core) {
if ($core->getIteratorIndex() == $position) { if ($core->getIteratorIndex() == $position) {
@@ -126,17 +126,17 @@ class Image extends AbstractImage implements ImageInterface, Iterator
public function width(): int public function width(): int
{ {
return $this->getFrame()->getCore()->getImageWidth(); return $this->frame()->getCore()->getImageWidth();
} }
public function height(): int public function height(): int
{ {
return $this->getFrame()->getCore()->getImageHeight(); return $this->frame()->getCore()->getImageHeight();
} }
public function pickColor(int $x, int $y, int $frame_key = 0): ?ColorInterface public function pickColor(int $x, int $y, int $frame_key = 0): ?ColorInterface
{ {
if ($frame = $this->getFrame($frame_key)) { if ($frame = $this->frame($frame_key)) {
return $this->pixelToColor( return $this->pixelToColor(
$frame->getCore()->getImagePixelColor($x, $y), $frame->getCore()->getImagePixelColor($x, $y),
$this->getColorspace() $this->getColorspace()

2
src/Drivers/Imagick/Modifiers/PlaceModifier.php
View File

@@ -29,7 +29,7 @@ class PlaceModifier implements ModifierInterface
foreach ($image as $frame) { foreach ($image as $frame) {
$frame->getCore()->compositeImage( $frame->getCore()->compositeImage(
$watermark->getFrame()->getCore(), $watermark->frame()->getCore(),
Imagick::COMPOSITE_DEFAULT, Imagick::COMPOSITE_DEFAULT,
$position->getX(), $position->getX(),
$position->getY() $position->getY()

2
src/Interfaces/ImageInterface.php
View File

@@ -14,7 +14,7 @@ interface ImageInterface extends Traversable, Countable
* @param int $position * @param int $position
* @return FrameInterface * @return FrameInterface
*/ */
public function getFrame(int $position = 0): FrameInterface; public function frame(int $position = 0): FrameInterface;
/** /**
* Add frame to animated image * Add frame to animated image

4
tests/Drivers/Gd/ImageTest.php
View File

@@ -56,8 +56,8 @@ class ImageTest extends TestCase
public function testGetFrame(): void public function testGetFrame(): void
{ {
$this->assertInstanceOf(Frame::class, $this->image->getFrame()); $this->assertInstanceOf(Frame::class, $this->image->frame());
$this->assertInstanceOf(Frame::class, $this->image->getFrame(1)); $this->assertInstanceOf(Frame::class, $this->image->frame(1));
} }
public function testAddFrame(): void public function testAddFrame(): void

2
tests/Drivers/Gd/Modifiers/DestroyModifierTest.php
View File

@@ -18,7 +18,7 @@ class DestroyModifierTest extends TestCase
public function testModify(): void public function testModify(): void
{ {
$image = $this->createTestImage('trim.png'); $image = $this->createTestImage('trim.png');
$this->assertInstanceOf(GdImage::class, $image->getFrame()->getCore()); $this->assertInstanceOf(GdImage::class, $image->frame()->getCore());
$image->modify(new DestroyModifier()); $image->modify(new DestroyModifier());
} }
} }

6
tests/Drivers/Imagick/ImageTest.php
View File

@@ -48,10 +48,10 @@ class ImageTest extends TestCase
public function testGetFrame(): void public function testGetFrame(): void
{ {
$this->assertInstanceOf(Frame::class, $this->image->getFrame()); $this->assertInstanceOf(Frame::class, $this->image->frame());
$this->assertInstanceOf(Frame::class, $this->image->getFrame(1)); $this->assertInstanceOf(Frame::class, $this->image->frame(1));
$this->expectException(AnimationException::class); $this->expectException(AnimationException::class);
$this->image->getFrame(2); $this->image->frame(2);
} }
public function testAddFrame(): void public function testAddFrame(): void

2
tests/Drivers/Imagick/Modifiers/DestroyModifierTest.php
View File

@@ -18,7 +18,7 @@ class DestroyModifierTest extends TestCase
public function testModify(): void public function testModify(): void
{ {
$image = $this->createTestImage('trim.png'); $image = $this->createTestImage('trim.png');
$this->assertInstanceOf(Imagick::class, $image->getFrame()->getCore()); $this->assertInstanceOf(Imagick::class, $image->frame()->getCore());
$image->modify(new DestroyModifier()); $image->modify(new DestroyModifier());
} }
} }