From 38b85fa0f65df7dc38a78d14ba5d5e9abc0b6f22 Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Tue, 5 Dec 2023 18:34:27 +0100 Subject: [PATCH] Rename methods Rename fit() to cover() and fitDown() to coverDown() --- ...FitDownModifier.php => CoverDownModifier.php} | 2 +- .../{FitModifier.php => CoverModifier.php} | 2 +- ...FitDownModifier.php => CoverDownModifier.php} | 2 +- .../{FitModifier.php => CoverModifier.php} | 2 +- src/Image.php | 16 ++++++++-------- src/Interfaces/ImageInterface.php | 8 ++++---- ...FitDownModifier.php => CoverDownModifier.php} | 2 +- .../{FitModifier.php => CoverModifier.php} | 2 +- ...FitModifierTest.php => CoverModifierTest.php} | 8 ++++---- ...FitModifierTest.php => CoverModifierTest.php} | 8 ++++---- 10 files changed, 26 insertions(+), 26 deletions(-) rename src/Drivers/Gd/Modifiers/{FitDownModifier.php => CoverDownModifier.php} (87%) rename src/Drivers/Gd/Modifiers/{FitModifier.php => CoverModifier.php} (97%) rename src/Drivers/Imagick/Modifiers/{FitDownModifier.php => CoverDownModifier.php} (87%) rename src/Drivers/Imagick/Modifiers/{FitModifier.php => CoverModifier.php} (94%) rename src/Modifiers/{FitDownModifier.php => CoverDownModifier.php} (53%) rename src/Modifiers/{FitModifier.php => CoverModifier.php} (94%) rename tests/Drivers/Gd/Modifiers/{FitModifierTest.php => CoverModifierTest.php} (79%) rename tests/Drivers/Imagick/Modifiers/{FitModifierTest.php => CoverModifierTest.php} (80%) diff --git a/src/Drivers/Gd/Modifiers/FitDownModifier.php b/src/Drivers/Gd/Modifiers/CoverDownModifier.php similarity index 87% rename from src/Drivers/Gd/Modifiers/FitDownModifier.php rename to src/Drivers/Gd/Modifiers/CoverDownModifier.php index 01ce432e..cec3b683 100644 --- a/src/Drivers/Gd/Modifiers/FitDownModifier.php +++ b/src/Drivers/Gd/Modifiers/CoverDownModifier.php @@ -8,7 +8,7 @@ use Intervention\Image\Interfaces\SizeInterface; * @property int $width * @property int $height */ -class FitDownModifier extends FitModifier +class CoverDownModifier extends CoverModifier { public function getResizeSize(SizeInterface $size): SizeInterface { diff --git a/src/Drivers/Gd/Modifiers/FitModifier.php b/src/Drivers/Gd/Modifiers/CoverModifier.php similarity index 97% rename from src/Drivers/Gd/Modifiers/FitModifier.php rename to src/Drivers/Gd/Modifiers/CoverModifier.php index 0624bbc6..0aa33a47 100644 --- a/src/Drivers/Gd/Modifiers/FitModifier.php +++ b/src/Drivers/Gd/Modifiers/CoverModifier.php @@ -11,7 +11,7 @@ use Intervention\Image\Interfaces\SizeInterface; * @method SizeInterface getResizeSize(ImageInterface $image) * @method SizeInterface getCropSize(ImageInterface $image) */ -class FitModifier extends DriverSpecializedModifier +class CoverModifier extends DriverSpecializedModifier { public function apply(ImageInterface $image): ImageInterface { diff --git a/src/Drivers/Imagick/Modifiers/FitDownModifier.php b/src/Drivers/Imagick/Modifiers/CoverDownModifier.php similarity index 87% rename from src/Drivers/Imagick/Modifiers/FitDownModifier.php rename to src/Drivers/Imagick/Modifiers/CoverDownModifier.php index 6b8a78e4..5cbb9338 100644 --- a/src/Drivers/Imagick/Modifiers/FitDownModifier.php +++ b/src/Drivers/Imagick/Modifiers/CoverDownModifier.php @@ -8,7 +8,7 @@ use Intervention\Image\Interfaces\SizeInterface; * @property int $width * @property int $height */ -class FitDownModifier extends FitModifier +class CoverDownModifier extends CoverModifier { public function getResizeSize(SizeInterface $size): SizeInterface { diff --git a/src/Drivers/Imagick/Modifiers/FitModifier.php b/src/Drivers/Imagick/Modifiers/CoverModifier.php similarity index 94% rename from src/Drivers/Imagick/Modifiers/FitModifier.php rename to src/Drivers/Imagick/Modifiers/CoverModifier.php index 6b31f3f7..8e5c09f1 100644 --- a/src/Drivers/Imagick/Modifiers/FitModifier.php +++ b/src/Drivers/Imagick/Modifiers/CoverModifier.php @@ -10,7 +10,7 @@ use Intervention\Image\Interfaces\SizeInterface; * @method SizeInterface getResizeSize(ImageInterface $image) * @method SizeInterface getCropSize(ImageInterface $image) */ -class FitModifier extends DriverSpecializedModifier +class CoverModifier extends DriverSpecializedModifier { public function apply(ImageInterface $image): ImageInterface { diff --git a/src/Image.php b/src/Image.php index d50a8307..02b7be0d 100644 --- a/src/Image.php +++ b/src/Image.php @@ -51,8 +51,8 @@ use Intervention\Image\Modifiers\DrawPixelModifier; use Intervention\Image\Modifiers\DrawPolygonModifier; use Intervention\Image\Modifiers\DrawRectangleModifier; use Intervention\Image\Modifiers\FillModifier; -use Intervention\Image\Modifiers\FitDownModifier; -use Intervention\Image\Modifiers\FitModifier; +use Intervention\Image\Modifiers\CoverDownModifier; +use Intervention\Image\Modifiers\CoverModifier; use Intervention\Image\Modifiers\FlipModifier; use Intervention\Image\Modifiers\FlopModifier; use Intervention\Image\Modifiers\GammaModifier; @@ -504,21 +504,21 @@ final class Image implements ImageInterface, Countable /** * {@inheritdoc} * - * @see ImageInterface::fit() + * @see ImageInterface::cover() */ - public function fit(int $width, int $height, string $position = 'center'): ImageInterface + public function cover(int $width, int $height, string $position = 'center'): ImageInterface { - return $this->modify(new FitModifier($width, $height, $position)); + return $this->modify(new CoverModifier($width, $height, $position)); } /** * {@inheritdoc} * - * @see ImageInterface::fitDown() + * @see ImageInterface::coverDown() */ - public function fitDown(int $width, int $height, string $position = 'center'): ImageInterface + public function coverDown(int $width, int $height, string $position = 'center'): ImageInterface { - return $this->modify(new FitDownModifier($width, $height, $position)); + return $this->modify(new CoverDownModifier($width, $height, $position)); } /** diff --git a/src/Interfaces/ImageInterface.php b/src/Interfaces/ImageInterface.php index e7cd7212..ba95101d 100644 --- a/src/Interfaces/ImageInterface.php +++ b/src/Interfaces/ImageInterface.php @@ -335,24 +335,24 @@ interface ImageInterface extends IteratorAggregate, Countable * @param string $position * @return ImageInterface */ - public function fit(int $width, int $height, string $position = 'center'): ImageInterface; + public function cover(int $width, int $height, string $position = 'center'): ImageInterface; /** - * Same as fit() but do not exceed the original image size + * Same as cover() but do not exceed the original image size * * @param int $width * @param int $height * @param string $position * @return ImageInterface */ - public function fitDown(int $width, int $height, string $position = 'center'): ImageInterface; + public function coverDown(int $width, int $height, string $position = 'center'): ImageInterface; /** * Padded resizing means that the original image is scaled until it fits the * defined target size with unchanged aspect ratio. The original image is * not scaled up but only down. * - * Compared to the fit() method, this method does not create cropped areas, + * Compared to the cover() method, this method does not create cropped areas, * but possibly new empty areas on the sides of the result image. These are * filled with the specified background color. * diff --git a/src/Modifiers/FitDownModifier.php b/src/Modifiers/CoverDownModifier.php similarity index 53% rename from src/Modifiers/FitDownModifier.php rename to src/Modifiers/CoverDownModifier.php index 6a792ad2..4ed2513d 100644 --- a/src/Modifiers/FitDownModifier.php +++ b/src/Modifiers/CoverDownModifier.php @@ -2,6 +2,6 @@ namespace Intervention\Image\Modifiers; -class FitDownModifier extends FitModifier +class CoverDownModifier extends CoverModifier { } diff --git a/src/Modifiers/FitModifier.php b/src/Modifiers/CoverModifier.php similarity index 94% rename from src/Modifiers/FitModifier.php rename to src/Modifiers/CoverModifier.php index 50a0d8ea..8b349219 100644 --- a/src/Modifiers/FitModifier.php +++ b/src/Modifiers/CoverModifier.php @@ -6,7 +6,7 @@ use Intervention\Image\Geometry\Rectangle; use Intervention\Image\Interfaces\ImageInterface; use Intervention\Image\Interfaces\SizeInterface; -class FitModifier extends AbstractModifier +class CoverModifier extends AbstractModifier { public function __construct( public int $width, diff --git a/tests/Drivers/Gd/Modifiers/FitModifierTest.php b/tests/Drivers/Gd/Modifiers/CoverModifierTest.php similarity index 79% rename from tests/Drivers/Gd/Modifiers/FitModifierTest.php rename to tests/Drivers/Gd/Modifiers/CoverModifierTest.php index 27618350..9d52dd43 100644 --- a/tests/Drivers/Gd/Modifiers/FitModifierTest.php +++ b/tests/Drivers/Gd/Modifiers/CoverModifierTest.php @@ -2,15 +2,15 @@ namespace Intervention\Image\Tests\Drivers\Gd\Modifiers; -use Intervention\Image\Modifiers\FitModifier; +use Intervention\Image\Modifiers\CoverModifier; use Intervention\Image\Tests\TestCase; use Intervention\Image\Tests\Traits\CanCreateGdTestImage; /** * @requires extension gd - * @covers \Intervention\Image\Modifiers\FitModifier + * @covers \Intervention\Image\Modifiers\CoverModifier */ -class FitModifierTest extends TestCase +class CoverModifierTest extends TestCase { use CanCreateGdTestImage; @@ -19,7 +19,7 @@ class FitModifierTest extends TestCase $image = $this->createTestImage('blocks.png'); $this->assertEquals(640, $image->width()); $this->assertEquals(480, $image->height()); - $image->modify(new FitModifier(100, 100, 'center')); + $image->modify(new CoverModifier(100, 100, 'center')); $this->assertEquals(100, $image->width()); $this->assertEquals(100, $image->height()); $this->assertColor(255, 0, 0, 255, $image->pickColor(90, 90)); diff --git a/tests/Drivers/Imagick/Modifiers/FitModifierTest.php b/tests/Drivers/Imagick/Modifiers/CoverModifierTest.php similarity index 80% rename from tests/Drivers/Imagick/Modifiers/FitModifierTest.php rename to tests/Drivers/Imagick/Modifiers/CoverModifierTest.php index 5ae25c1b..cb93666e 100644 --- a/tests/Drivers/Imagick/Modifiers/FitModifierTest.php +++ b/tests/Drivers/Imagick/Modifiers/CoverModifierTest.php @@ -2,15 +2,15 @@ namespace Intervention\Image\Tests\Drivers\Imagick\Modifiers; -use Intervention\Image\Modifiers\FitModifier; +use Intervention\Image\Modifiers\CoverModifier; use Intervention\Image\Tests\TestCase; use Intervention\Image\Tests\Traits\CanCreateImagickTestImage; /** * @requires extension imagick - * @covers \Intervention\Image\Modifiers\FitModifier + * @covers \Intervention\Image\Modifiers\CoverModifier */ -class FitModifierTest extends TestCase +class CoverModifierTest extends TestCase { use CanCreateImagickTestImage; @@ -19,7 +19,7 @@ class FitModifierTest extends TestCase $image = $this->createTestImage('blocks.png'); $this->assertEquals(640, $image->width()); $this->assertEquals(480, $image->height()); - $image->modify(new FitModifier(100, 100, 'center')); + $image->modify(new CoverModifier(100, 100, 'center')); $this->assertEquals(100, $image->width()); $this->assertEquals(100, $image->height()); $this->assertColor(255, 0, 0, 255, $image->pickColor(90, 90));