From 9150e4bfa3f0921b60d324aaaf59fa58e7ed27c9 Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Tue, 24 Oct 2023 19:52:21 +0200 Subject: [PATCH] Rename method Image::getSize to Image::size --- src/Drivers/Abstract/AbstractImage.php | 7 +------ src/Drivers/Abstract/Modifiers/AbstractFitModifier.php | 2 +- src/Drivers/Abstract/Modifiers/AbstractPadModifier.php | 2 +- src/Drivers/Gd/Modifiers/CropModifier.php | 2 +- src/Drivers/Gd/Modifiers/PadDownModifier.php | 2 +- src/Drivers/Gd/Modifiers/PlaceModifier.php | 4 ++-- src/Drivers/Gd/Modifiers/ResizeDownModifier.php | 2 +- src/Drivers/Gd/Modifiers/ResizeModifier.php | 2 +- src/Drivers/Gd/Modifiers/ScaleDownModifier.php | 2 +- src/Drivers/Gd/Modifiers/ScaleModifier.php | 2 +- src/Drivers/Imagick/Modifiers/CropModifier.php | 2 +- src/Drivers/Imagick/Modifiers/PadDownModifier.php | 2 +- src/Drivers/Imagick/Modifiers/PlaceModifier.php | 4 ++-- src/Drivers/Imagick/Modifiers/ResizeDownModifier.php | 2 +- src/Drivers/Imagick/Modifiers/ResizeModifier.php | 2 +- src/Drivers/Imagick/Modifiers/ScaleDownModifier.php | 2 +- src/Drivers/Imagick/Modifiers/ScaleModifier.php | 2 +- src/Interfaces/ImageInterface.php | 2 +- tests/Drivers/Abstract/AbstractImageTest.php | 8 ++++---- tests/Drivers/Gd/ImageTest.php | 2 +- tests/Drivers/Imagick/ImageTest.php | 2 +- 21 files changed, 26 insertions(+), 31 deletions(-) diff --git a/src/Drivers/Abstract/AbstractImage.php b/src/Drivers/Abstract/AbstractImage.php index 7bd16e15..9143ed66 100644 --- a/src/Drivers/Abstract/AbstractImage.php +++ b/src/Drivers/Abstract/AbstractImage.php @@ -38,14 +38,9 @@ abstract class AbstractImage implements ImageInterface return $this; } - public function getSize(): SizeInterface - { - return new Rectangle($this->width(), $this->height()); - } - public function size(): SizeInterface { - return $this->getSize(); + return new Rectangle($this->width(), $this->height()); } public function modify(ModifierInterface $modifier): ImageInterface diff --git a/src/Drivers/Abstract/Modifiers/AbstractFitModifier.php b/src/Drivers/Abstract/Modifiers/AbstractFitModifier.php index 3ba1bacb..4b759aed 100644 --- a/src/Drivers/Abstract/Modifiers/AbstractFitModifier.php +++ b/src/Drivers/Abstract/Modifiers/AbstractFitModifier.php @@ -18,7 +18,7 @@ abstract class AbstractFitModifier protected function getCropSize(ImageInterface $image): SizeInterface { - $imagesize = $image->getSize(); + $imagesize = $image->size(); $crop = new Rectangle($this->width, $this->height); $crop = $crop->contain( diff --git a/src/Drivers/Abstract/Modifiers/AbstractPadModifier.php b/src/Drivers/Abstract/Modifiers/AbstractPadModifier.php index 0ae8e725..7a001e95 100644 --- a/src/Drivers/Abstract/Modifiers/AbstractPadModifier.php +++ b/src/Drivers/Abstract/Modifiers/AbstractPadModifier.php @@ -22,7 +22,7 @@ abstract class AbstractPadModifier protected function getCropSize(ImageInterface $image): SizeInterface { - return $image->getSize() + return $image->size() ->contain($this->width, $this->height) ->alignPivotTo($this->getResizeSize($image), $this->position); } diff --git a/src/Drivers/Gd/Modifiers/CropModifier.php b/src/Drivers/Gd/Modifiers/CropModifier.php index c32c1664..4e75a70e 100644 --- a/src/Drivers/Gd/Modifiers/CropModifier.php +++ b/src/Drivers/Gd/Modifiers/CropModifier.php @@ -24,7 +24,7 @@ class CropModifier implements ModifierInterface { $crop = new Rectangle($this->width, $this->height); $crop->align($this->position); - $crop->alignPivotTo($image->getSize(), $this->position); + $crop->alignPivotTo($image->size(), $this->position); foreach ($image as $frame) { $this->cropFrame($frame, $crop); diff --git a/src/Drivers/Gd/Modifiers/PadDownModifier.php b/src/Drivers/Gd/Modifiers/PadDownModifier.php index 95cc0b76..b8242699 100644 --- a/src/Drivers/Gd/Modifiers/PadDownModifier.php +++ b/src/Drivers/Gd/Modifiers/PadDownModifier.php @@ -12,7 +12,7 @@ class PadDownModifier extends PadModifier { $resize = $this->getResizeSize($image); - return $image->getSize() + return $image->size() ->contain($resize->getWidth(), $resize->getHeight()) ->alignPivotTo($resize, $this->position); } diff --git a/src/Drivers/Gd/Modifiers/PlaceModifier.php b/src/Drivers/Gd/Modifiers/PlaceModifier.php index 4fe9c3e5..8ecd7fef 100644 --- a/src/Drivers/Gd/Modifiers/PlaceModifier.php +++ b/src/Drivers/Gd/Modifiers/PlaceModifier.php @@ -48,8 +48,8 @@ class PlaceModifier implements ModifierInterface protected function getPosition(ImageInterface $image, ImageInterface $watermark): PointInterface { - $image_size = $image->getSize()->movePivot($this->position, $this->offset_x, $this->offset_y); - $watermark_size = $watermark->getSize()->movePivot($this->position); + $image_size = $image->size()->movePivot($this->position, $this->offset_x, $this->offset_y); + $watermark_size = $watermark->size()->movePivot($this->position); return $image_size->getRelativePositionTo($watermark_size); } diff --git a/src/Drivers/Gd/Modifiers/ResizeDownModifier.php b/src/Drivers/Gd/Modifiers/ResizeDownModifier.php index 12503758..33aa9598 100644 --- a/src/Drivers/Gd/Modifiers/ResizeDownModifier.php +++ b/src/Drivers/Gd/Modifiers/ResizeDownModifier.php @@ -9,6 +9,6 @@ class ResizeDownModifier extends ResizeModifier { protected function getAdjustedSize(ImageInterface $image): SizeInterface { - return $image->getSize()->resizeDown($this->width, $this->height); + return $image->size()->resizeDown($this->width, $this->height); } } diff --git a/src/Drivers/Gd/Modifiers/ResizeModifier.php b/src/Drivers/Gd/Modifiers/ResizeModifier.php index 512491f5..4754085c 100644 --- a/src/Drivers/Gd/Modifiers/ResizeModifier.php +++ b/src/Drivers/Gd/Modifiers/ResizeModifier.php @@ -27,7 +27,7 @@ class ResizeModifier implements ModifierInterface protected function getAdjustedSize(ImageInterface $image): SizeInterface { - return $image->getSize()->resize($this->width, $this->height); + return $image->size()->resize($this->width, $this->height); } protected function resizeFrame(FrameInterface $frame, SizeInterface $resizeTo): void diff --git a/src/Drivers/Gd/Modifiers/ScaleDownModifier.php b/src/Drivers/Gd/Modifiers/ScaleDownModifier.php index 3a0e5b9a..c351c98c 100644 --- a/src/Drivers/Gd/Modifiers/ScaleDownModifier.php +++ b/src/Drivers/Gd/Modifiers/ScaleDownModifier.php @@ -9,6 +9,6 @@ class ScaleDownModifier extends ResizeModifier { protected function getAdjustedSize(ImageInterface $image): SizeInterface { - return $image->getSize()->scaleDown($this->width, $this->height); + return $image->size()->scaleDown($this->width, $this->height); } } diff --git a/src/Drivers/Gd/Modifiers/ScaleModifier.php b/src/Drivers/Gd/Modifiers/ScaleModifier.php index ff7491af..9e6c48b5 100644 --- a/src/Drivers/Gd/Modifiers/ScaleModifier.php +++ b/src/Drivers/Gd/Modifiers/ScaleModifier.php @@ -9,6 +9,6 @@ class ScaleModifier extends ResizeModifier { protected function getAdjustedSize(ImageInterface $image): SizeInterface { - return $image->getSize()->scale($this->width, $this->height); + return $image->size()->scale($this->width, $this->height); } } diff --git a/src/Drivers/Imagick/Modifiers/CropModifier.php b/src/Drivers/Imagick/Modifiers/CropModifier.php index eae927ed..b0470d8b 100644 --- a/src/Drivers/Imagick/Modifiers/CropModifier.php +++ b/src/Drivers/Imagick/Modifiers/CropModifier.php @@ -22,7 +22,7 @@ class CropModifier implements ModifierInterface { $crop = new Rectangle($this->width, $this->height); $crop->align($this->position); - $crop->alignPivotTo($image->getSize(), $this->position); + $crop->alignPivotTo($image->size(), $this->position); foreach ($image as $frame) { $frame->getCore()->extentImage( diff --git a/src/Drivers/Imagick/Modifiers/PadDownModifier.php b/src/Drivers/Imagick/Modifiers/PadDownModifier.php index 29579c64..d99b5dd7 100644 --- a/src/Drivers/Imagick/Modifiers/PadDownModifier.php +++ b/src/Drivers/Imagick/Modifiers/PadDownModifier.php @@ -12,7 +12,7 @@ class PadDownModifier extends PadModifier { $resize = $this->getResizeSize($image); - return $image->getSize() + return $image->size() ->contain($resize->getWidth(), $resize->getHeight()) ->alignPivotTo($resize, $this->position); } diff --git a/src/Drivers/Imagick/Modifiers/PlaceModifier.php b/src/Drivers/Imagick/Modifiers/PlaceModifier.php index 775e7585..477ac635 100644 --- a/src/Drivers/Imagick/Modifiers/PlaceModifier.php +++ b/src/Drivers/Imagick/Modifiers/PlaceModifier.php @@ -41,8 +41,8 @@ class PlaceModifier implements ModifierInterface protected function getPosition(ImageInterface $image, Image $watermark): PointInterface { - $image_size = $image->getSize()->movePivot($this->position, $this->offset_x, $this->offset_y); - $watermark_size = $watermark->getSize()->movePivot($this->position); + $image_size = $image->size()->movePivot($this->position, $this->offset_x, $this->offset_y); + $watermark_size = $watermark->size()->movePivot($this->position); return $image_size->getRelativePositionTo($watermark_size); } diff --git a/src/Drivers/Imagick/Modifiers/ResizeDownModifier.php b/src/Drivers/Imagick/Modifiers/ResizeDownModifier.php index 068dbccb..48c11e88 100644 --- a/src/Drivers/Imagick/Modifiers/ResizeDownModifier.php +++ b/src/Drivers/Imagick/Modifiers/ResizeDownModifier.php @@ -9,6 +9,6 @@ class ResizeDownModifier extends ResizeModifier { protected function getAdjustedSize(ImageInterface $image): SizeInterface { - return $image->getSize()->resizeDown($this->width, $this->height); + return $image->size()->resizeDown($this->width, $this->height); } } diff --git a/src/Drivers/Imagick/Modifiers/ResizeModifier.php b/src/Drivers/Imagick/Modifiers/ResizeModifier.php index 41f3ad68..1e482450 100644 --- a/src/Drivers/Imagick/Modifiers/ResizeModifier.php +++ b/src/Drivers/Imagick/Modifiers/ResizeModifier.php @@ -29,6 +29,6 @@ class ResizeModifier implements ModifierInterface protected function getAdjustedSize(ImageInterface $image): SizeInterface { - return $image->getSize()->resize($this->width, $this->height); + return $image->size()->resize($this->width, $this->height); } } diff --git a/src/Drivers/Imagick/Modifiers/ScaleDownModifier.php b/src/Drivers/Imagick/Modifiers/ScaleDownModifier.php index 45ec70f1..895e7e51 100644 --- a/src/Drivers/Imagick/Modifiers/ScaleDownModifier.php +++ b/src/Drivers/Imagick/Modifiers/ScaleDownModifier.php @@ -9,6 +9,6 @@ class ScaleDownModifier extends ResizeModifier { protected function getAdjustedSize(ImageInterface $image): SizeInterface { - return $image->getSize()->scaleDown($this->width, $this->height); + return $image->size()->scaleDown($this->width, $this->height); } } diff --git a/src/Drivers/Imagick/Modifiers/ScaleModifier.php b/src/Drivers/Imagick/Modifiers/ScaleModifier.php index 2e99fae6..93abcb4f 100644 --- a/src/Drivers/Imagick/Modifiers/ScaleModifier.php +++ b/src/Drivers/Imagick/Modifiers/ScaleModifier.php @@ -9,6 +9,6 @@ class ScaleModifier extends ResizeModifier { protected function getAdjustedSize(ImageInterface $image): SizeInterface { - return $image->getSize()->scale($this->width, $this->height); + return $image->size()->scale($this->width, $this->height); } } diff --git a/src/Interfaces/ImageInterface.php b/src/Interfaces/ImageInterface.php index 8e9df0ea..784442eb 100644 --- a/src/Interfaces/ImageInterface.php +++ b/src/Interfaces/ImageInterface.php @@ -53,7 +53,7 @@ interface ImageInterface extends Traversable, Countable * * @return SizeInterface */ - public function getSize(): SizeInterface; + public function size(): SizeInterface; /** * Return exif data of current image diff --git a/tests/Drivers/Abstract/AbstractImageTest.php b/tests/Drivers/Abstract/AbstractImageTest.php index 6494c5c9..2707859c 100644 --- a/tests/Drivers/Abstract/AbstractImageTest.php +++ b/tests/Drivers/Abstract/AbstractImageTest.php @@ -44,15 +44,15 @@ class AbstractImageTest extends TestCase public function testGetSize(): void { $img = $this->abstractImageMock(); - $this->assertInstanceOf(Rectangle::class, $img->getSize()); - $this->assertEquals(300, $img->getSize()->getWidth()); - $this->assertEquals(200, $img->getSize()->getHeight()); + $this->assertInstanceOf(Rectangle::class, $img->size()); + $this->assertEquals(300, $img->size()->getWidth()); + $this->assertEquals(200, $img->size()->getHeight()); } public function testSizeAlias(): void { $img = $this->abstractImageMock(); - $this->assertInstanceOf(Rectangle::class, $img->getSize()); + $this->assertInstanceOf(Rectangle::class, $img->size()); $this->assertEquals(300, $img->size()->getWidth()); $this->assertEquals(200, $img->size()->getHeight()); } diff --git a/tests/Drivers/Gd/ImageTest.php b/tests/Drivers/Gd/ImageTest.php index abeaf2f8..f93858c4 100644 --- a/tests/Drivers/Gd/ImageTest.php +++ b/tests/Drivers/Gd/ImageTest.php @@ -92,7 +92,7 @@ class ImageTest extends TestCase public function testGetSize(): void { - $this->assertInstanceOf(Rectangle::class, $this->image->getSize()); + $this->assertInstanceOf(Rectangle::class, $this->image->size()); } public function testPickColor(): void diff --git a/tests/Drivers/Imagick/ImageTest.php b/tests/Drivers/Imagick/ImageTest.php index 440b90a8..c2f0e188 100644 --- a/tests/Drivers/Imagick/ImageTest.php +++ b/tests/Drivers/Imagick/ImageTest.php @@ -87,7 +87,7 @@ class ImageTest extends TestCase public function testGetSize(): void { - $this->assertInstanceOf(Rectangle::class, $this->image->getSize()); + $this->assertInstanceOf(Rectangle::class, $this->image->size()); } public function testGetColorspace(): void