From 43d37541dba82300024dda9e242d5a156a48dc2e Mon Sep 17 00:00:00 2001
From: Oliver Vogel <oliver@olivervogel.com>
Date: Thu, 26 Oct 2023 15:53:26 +0200
Subject: [PATCH] Rename method

Image::getFrame() to Image::frame()
---
 src/Drivers/Gd/Encoders/AvifEncoder.php                 | 2 +-
 src/Drivers/Gd/Encoders/BmpEncoder.php                  | 2 +-
 src/Drivers/Gd/Encoders/GifEncoder.php                  | 2 +-
 src/Drivers/Gd/Encoders/JpegEncoder.php                 | 2 +-
 src/Drivers/Gd/Encoders/PngEncoder.php                  | 2 +-
 src/Drivers/Gd/Encoders/WebpEncoder.php                 | 2 +-
 src/Drivers/Gd/Image.php                                | 8 ++++----
 src/Drivers/Gd/ImageFactory.php                         | 2 +-
 src/Drivers/Gd/Modifiers/PlaceModifier.php              | 2 +-
 src/Drivers/Imagick/Encoders/AvifEncoder.php            | 2 +-
 src/Drivers/Imagick/Encoders/BmpEncoder.php             | 2 +-
 src/Drivers/Imagick/Encoders/JpegEncoder.php            | 2 +-
 src/Drivers/Imagick/Encoders/PngEncoder.php             | 2 +-
 src/Drivers/Imagick/Encoders/WebpEncoder.php            | 2 +-
 src/Drivers/Imagick/Image.php                           | 8 ++++----
 src/Drivers/Imagick/Modifiers/PlaceModifier.php         | 2 +-
 src/Interfaces/ImageInterface.php                       | 2 +-
 tests/Drivers/Gd/ImageTest.php                          | 4 ++--
 tests/Drivers/Gd/Modifiers/DestroyModifierTest.php      | 2 +-
 tests/Drivers/Imagick/ImageTest.php                     | 6 +++---
 tests/Drivers/Imagick/Modifiers/DestroyModifierTest.php | 2 +-
 21 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/Drivers/Gd/Encoders/AvifEncoder.php b/src/Drivers/Gd/Encoders/AvifEncoder.php
index aaa39ea5..6637aeef 100644
--- a/src/Drivers/Gd/Encoders/AvifEncoder.php
+++ b/src/Drivers/Gd/Encoders/AvifEncoder.php
@@ -17,7 +17,7 @@ class AvifEncoder extends AbstractEncoder implements EncoderInterface
     public function encode(ImageInterface $image): EncodedImage
     {
         $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');
diff --git a/src/Drivers/Gd/Encoders/BmpEncoder.php b/src/Drivers/Gd/Encoders/BmpEncoder.php
index 422c8b5b..b100d180 100644
--- a/src/Drivers/Gd/Encoders/BmpEncoder.php
+++ b/src/Drivers/Gd/Encoders/BmpEncoder.php
@@ -12,7 +12,7 @@ class BmpEncoder extends AbstractEncoder implements EncoderInterface
     public function encode(ImageInterface $image): EncodedImage
     {
         $data = $this->getBuffered(function () use ($image) {
-            imagebmp($image->getFrame()->getCore(), null, false);
+            imagebmp($image->frame()->getCore(), null, false);
         });
 
         return new EncodedImage($data, 'image/bmp');
diff --git a/src/Drivers/Gd/Encoders/GifEncoder.php b/src/Drivers/Gd/Encoders/GifEncoder.php
index e9606e33..b01fdd03 100644
--- a/src/Drivers/Gd/Encoders/GifEncoder.php
+++ b/src/Drivers/Gd/Encoders/GifEncoder.php
@@ -17,7 +17,7 @@ class GifEncoder extends AbstractEncoder implements EncoderInterface
         }
 
         $data = $this->getBuffered(function () use ($image) {
-            imagegif($image->getFrame()->getCore());
+            imagegif($image->frame()->getCore());
         });
 
         return new EncodedImage($data, 'image/gif');
diff --git a/src/Drivers/Gd/Encoders/JpegEncoder.php b/src/Drivers/Gd/Encoders/JpegEncoder.php
index 2a8d41da..4be055fa 100644
--- a/src/Drivers/Gd/Encoders/JpegEncoder.php
+++ b/src/Drivers/Gd/Encoders/JpegEncoder.php
@@ -17,7 +17,7 @@ class JpegEncoder extends AbstractEncoder implements EncoderInterface
     public function encode(ImageInterface $image): EncodedImage
     {
         $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');
diff --git a/src/Drivers/Gd/Encoders/PngEncoder.php b/src/Drivers/Gd/Encoders/PngEncoder.php
index 4369ef14..89398bd0 100644
--- a/src/Drivers/Gd/Encoders/PngEncoder.php
+++ b/src/Drivers/Gd/Encoders/PngEncoder.php
@@ -12,7 +12,7 @@ class PngEncoder extends AbstractEncoder implements EncoderInterface
     public function encode(ImageInterface $image): EncodedImage
     {
         $data = $this->getBuffered(function () use ($image) {
-            imagepng($image->getFrame()->getCore(), null, -1);
+            imagepng($image->frame()->getCore(), null, -1);
         });
 
         return new EncodedImage($data, 'image/png');
diff --git a/src/Drivers/Gd/Encoders/WebpEncoder.php b/src/Drivers/Gd/Encoders/WebpEncoder.php
index 581358f0..ee8b9b72 100644
--- a/src/Drivers/Gd/Encoders/WebpEncoder.php
+++ b/src/Drivers/Gd/Encoders/WebpEncoder.php
@@ -17,7 +17,7 @@ class WebpEncoder extends AbstractEncoder implements EncoderInterface
     public function encode(ImageInterface $image): EncodedImage
     {
         $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');
diff --git a/src/Drivers/Gd/Image.php b/src/Drivers/Gd/Image.php
index 32a020fc..dbe8ea53 100644
--- a/src/Drivers/Gd/Image.php
+++ b/src/Drivers/Gd/Image.php
@@ -52,7 +52,7 @@ class Image extends AbstractImage implements ImageInterface, IteratorAggregate
         return $this;
     }
 
-    public function getFrame(int $position = 0): FrameInterface
+    public function frame(int $position = 0): FrameInterface
     {
         if ($frame = $this->frames->get($position)) {
             return $frame;
@@ -70,17 +70,17 @@ class Image extends AbstractImage implements ImageInterface, IteratorAggregate
 
     public function width(): int
     {
-        return imagesx($this->getFrame()->getCore());
+        return imagesx($this->frame()->getCore());
     }
 
     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
     {
-        if ($frame = $this->getFrame($frame_key)) {
+        if ($frame = $this->frame($frame_key)) {
             return $this->integerToColor(
                 imagecolorat($frame->getCore(), $x, $y)
             );
diff --git a/src/Drivers/Gd/ImageFactory.php b/src/Drivers/Gd/ImageFactory.php
index 134e6a81..b1cf1ed0 100644
--- a/src/Drivers/Gd/ImageFactory.php
+++ b/src/Drivers/Gd/ImageFactory.php
@@ -47,7 +47,7 @@ class ImageFactory implements FactoryInterface
             {
                 $this->frames->push(
                     $this->handleInput($source)
-                         ->getFrame()
+                         ->frame()
                          ->setDelay($delay)
                 );
 
diff --git a/src/Drivers/Gd/Modifiers/PlaceModifier.php b/src/Drivers/Gd/Modifiers/PlaceModifier.php
index 8ecd7fef..515591ed 100644
--- a/src/Drivers/Gd/Modifiers/PlaceModifier.php
+++ b/src/Drivers/Gd/Modifiers/PlaceModifier.php
@@ -33,7 +33,7 @@ class PlaceModifier implements ModifierInterface
             imagealphablending($frame->getCore(), true);
             imagecopy(
                 $frame->getCore(),
-                $watermark->getFrame()->getCore(),
+                $watermark->frame()->getCore(),
                 $position->getX(),
                 $position->getY(),
                 0,
diff --git a/src/Drivers/Imagick/Encoders/AvifEncoder.php b/src/Drivers/Imagick/Encoders/AvifEncoder.php
index 0cc85604..bcc85b41 100644
--- a/src/Drivers/Imagick/Encoders/AvifEncoder.php
+++ b/src/Drivers/Imagick/Encoders/AvifEncoder.php
@@ -15,7 +15,7 @@ class AvifEncoder extends AbstractEncoder implements EncoderInterface
         $format = 'AVIF';
         $compression = Imagick::COMPRESSION_ZIP;
 
-        $imagick = $image->getFrame()->getCore();
+        $imagick = $image->frame()->getCore();
         $imagick->setFormat($format);
         $imagick->setImageFormat($format);
         $imagick->setCompression($compression);
diff --git a/src/Drivers/Imagick/Encoders/BmpEncoder.php b/src/Drivers/Imagick/Encoders/BmpEncoder.php
index 6f6bd932..e22f83ad 100644
--- a/src/Drivers/Imagick/Encoders/BmpEncoder.php
+++ b/src/Drivers/Imagick/Encoders/BmpEncoder.php
@@ -15,7 +15,7 @@ class BmpEncoder extends AbstractEncoder implements EncoderInterface
         $format = 'bmp';
         $compression = Imagick::COMPRESSION_NO;
 
-        $imagick = $image->getFrame()->getCore();
+        $imagick = $image->frame()->getCore();
         $imagick->setFormat($format);
         $imagick->setImageFormat($format);
         $imagick->setCompression($compression);
diff --git a/src/Drivers/Imagick/Encoders/JpegEncoder.php b/src/Drivers/Imagick/Encoders/JpegEncoder.php
index c6191704..ccf64378 100644
--- a/src/Drivers/Imagick/Encoders/JpegEncoder.php
+++ b/src/Drivers/Imagick/Encoders/JpegEncoder.php
@@ -20,7 +20,7 @@ class JpegEncoder extends AbstractEncoder implements EncoderInterface
         $format = 'jpeg';
         $compression = Imagick::COMPRESSION_JPEG;
 
-        $imagick = $image->getFrame()->getCore();
+        $imagick = $image->frame()->getCore();
         $imagick->setImageBackgroundColor('white');
         $imagick->setBackgroundColor('white');
         $imagick->setFormat($format);
diff --git a/src/Drivers/Imagick/Encoders/PngEncoder.php b/src/Drivers/Imagick/Encoders/PngEncoder.php
index 3599c02e..3fb151fc 100644
--- a/src/Drivers/Imagick/Encoders/PngEncoder.php
+++ b/src/Drivers/Imagick/Encoders/PngEncoder.php
@@ -15,7 +15,7 @@ class PngEncoder extends AbstractEncoder implements EncoderInterface
         $format = 'png';
         $compression = Imagick::COMPRESSION_ZIP;
 
-        $imagick = $image->getFrame()->getCore();
+        $imagick = $image->frame()->getCore();
         $imagick->setFormat($format);
         $imagick->setImageFormat($format);
         $imagick->setCompression($compression);
diff --git a/src/Drivers/Imagick/Encoders/WebpEncoder.php b/src/Drivers/Imagick/Encoders/WebpEncoder.php
index 3f445233..b95a5cee 100644
--- a/src/Drivers/Imagick/Encoders/WebpEncoder.php
+++ b/src/Drivers/Imagick/Encoders/WebpEncoder.php
@@ -21,7 +21,7 @@ class WebpEncoder extends AbstractEncoder implements EncoderInterface
         $format = 'webp';
         $compression = Imagick::COMPRESSION_ZIP;
 
-        $imagick = $image->getFrame()->getCore();
+        $imagick = $image->frame()->getCore();
         $imagick->setImageBackgroundColor(new ImagickPixel('transparent'));
 
         $imagick = $imagick->mergeImageLayers(Imagick::LAYERMETHOD_MERGE);
diff --git a/src/Drivers/Imagick/Image.php b/src/Drivers/Imagick/Image.php
index fe46b61c..f7226f46 100644
--- a/src/Drivers/Imagick/Image.php
+++ b/src/Drivers/Imagick/Image.php
@@ -37,7 +37,7 @@ class Image extends AbstractImage implements ImageInterface, Iterator
         return $this->imagick;
     }
 
-    public function getFrame(int $position = 0): FrameInterface
+    public function frame(int $position = 0): FrameInterface
     {
         foreach ($this->imagick as $core) {
             if ($core->getIteratorIndex() == $position) {
@@ -126,17 +126,17 @@ class Image extends AbstractImage implements ImageInterface, Iterator
 
     public function width(): int
     {
-        return $this->getFrame()->getCore()->getImageWidth();
+        return $this->frame()->getCore()->getImageWidth();
     }
 
     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
     {
-        if ($frame = $this->getFrame($frame_key)) {
+        if ($frame = $this->frame($frame_key)) {
             return $this->pixelToColor(
                 $frame->getCore()->getImagePixelColor($x, $y),
                 $this->getColorspace()
diff --git a/src/Drivers/Imagick/Modifiers/PlaceModifier.php b/src/Drivers/Imagick/Modifiers/PlaceModifier.php
index 477ac635..572ab92f 100644
--- a/src/Drivers/Imagick/Modifiers/PlaceModifier.php
+++ b/src/Drivers/Imagick/Modifiers/PlaceModifier.php
@@ -29,7 +29,7 @@ class PlaceModifier implements ModifierInterface
 
         foreach ($image as $frame) {
             $frame->getCore()->compositeImage(
-                $watermark->getFrame()->getCore(),
+                $watermark->frame()->getCore(),
                 Imagick::COMPOSITE_DEFAULT,
                 $position->getX(),
                 $position->getY()
diff --git a/src/Interfaces/ImageInterface.php b/src/Interfaces/ImageInterface.php
index 470c97a9..c179f168 100644
--- a/src/Interfaces/ImageInterface.php
+++ b/src/Interfaces/ImageInterface.php
@@ -14,7 +14,7 @@ interface ImageInterface extends Traversable, Countable
      * @param int $position
      * @return FrameInterface
      */
-    public function getFrame(int $position = 0): FrameInterface;
+    public function frame(int $position = 0): FrameInterface;
 
     /**
      * Add frame to animated image
diff --git a/tests/Drivers/Gd/ImageTest.php b/tests/Drivers/Gd/ImageTest.php
index b42d8e86..26a7c344 100644
--- a/tests/Drivers/Gd/ImageTest.php
+++ b/tests/Drivers/Gd/ImageTest.php
@@ -56,8 +56,8 @@ class ImageTest extends TestCase
 
     public function testGetFrame(): void
     {
-        $this->assertInstanceOf(Frame::class, $this->image->getFrame());
-        $this->assertInstanceOf(Frame::class, $this->image->getFrame(1));
+        $this->assertInstanceOf(Frame::class, $this->image->frame());
+        $this->assertInstanceOf(Frame::class, $this->image->frame(1));
     }
 
     public function testAddFrame(): void
diff --git a/tests/Drivers/Gd/Modifiers/DestroyModifierTest.php b/tests/Drivers/Gd/Modifiers/DestroyModifierTest.php
index 378f7e24..2a51c41d 100644
--- a/tests/Drivers/Gd/Modifiers/DestroyModifierTest.php
+++ b/tests/Drivers/Gd/Modifiers/DestroyModifierTest.php
@@ -18,7 +18,7 @@ class DestroyModifierTest extends TestCase
     public function testModify(): void
     {
         $image = $this->createTestImage('trim.png');
-        $this->assertInstanceOf(GdImage::class, $image->getFrame()->getCore());
+        $this->assertInstanceOf(GdImage::class, $image->frame()->getCore());
         $image->modify(new DestroyModifier());
     }
 }
diff --git a/tests/Drivers/Imagick/ImageTest.php b/tests/Drivers/Imagick/ImageTest.php
index f3202513..91b40631 100644
--- a/tests/Drivers/Imagick/ImageTest.php
+++ b/tests/Drivers/Imagick/ImageTest.php
@@ -48,10 +48,10 @@ class ImageTest extends TestCase
 
     public function testGetFrame(): void
     {
-        $this->assertInstanceOf(Frame::class, $this->image->getFrame());
-        $this->assertInstanceOf(Frame::class, $this->image->getFrame(1));
+        $this->assertInstanceOf(Frame::class, $this->image->frame());
+        $this->assertInstanceOf(Frame::class, $this->image->frame(1));
         $this->expectException(AnimationException::class);
-        $this->image->getFrame(2);
+        $this->image->frame(2);
     }
 
     public function testAddFrame(): void
diff --git a/tests/Drivers/Imagick/Modifiers/DestroyModifierTest.php b/tests/Drivers/Imagick/Modifiers/DestroyModifierTest.php
index 803f4b6c..3923e2ff 100644
--- a/tests/Drivers/Imagick/Modifiers/DestroyModifierTest.php
+++ b/tests/Drivers/Imagick/Modifiers/DestroyModifierTest.php
@@ -18,7 +18,7 @@ class DestroyModifierTest extends TestCase
     public function testModify(): void
     {
         $image = $this->createTestImage('trim.png');
-        $this->assertInstanceOf(Imagick::class, $image->getFrame()->getCore());
+        $this->assertInstanceOf(Imagick::class, $image->frame()->getCore());
         $image->modify(new DestroyModifier());
     }
 }