From 2b0001334acb236167f5bbed5ea01a4da9ece78b Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Thu, 26 Oct 2023 16:25:32 +0200 Subject: [PATCH] Rename method - ImageInterface::getColorspace to ImageInterface::colorspace --- src/Drivers/Gd/Image.php | 2 +- src/Drivers/Imagick/Image.php | 4 ++-- .../Imagick/Modifiers/DrawEllipseModifier.php | 2 +- .../Imagick/Modifiers/DrawLineModifier.php | 2 +- .../Imagick/Modifiers/DrawPixelModifier.php | 2 +- .../Imagick/Modifiers/DrawPolygonModifier.php | 2 +- .../Imagick/Modifiers/DrawRectangleModifier.php | 2 +- src/Drivers/Imagick/Modifiers/FillModifier.php | 2 +- src/Drivers/Imagick/Modifiers/RotateModifier.php | 2 +- src/Drivers/Imagick/Modifiers/TextWriter.php | 2 +- src/Interfaces/ImageInterface.php | 2 +- tests/Drivers/Gd/ImageTest.php | 8 ++++---- .../Imagick/Decoders/BinaryImageDecoderTest.php | 4 ++-- tests/Drivers/Imagick/ImageTest.php | 16 ++++++++-------- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Drivers/Gd/Image.php b/src/Drivers/Gd/Image.php index c2887c7c..c0f77f6b 100644 --- a/src/Drivers/Gd/Image.php +++ b/src/Drivers/Gd/Image.php @@ -90,7 +90,7 @@ class Image extends AbstractImage implements ImageInterface, IteratorAggregate * * @see ImageInterface::getColorspace() */ - public function getColorspace(): ColorspaceInterface + public function colorspace(): ColorspaceInterface { return new RgbColorspace(); } diff --git a/src/Drivers/Imagick/Image.php b/src/Drivers/Imagick/Image.php index 74f5ebfd..58da6ecb 100644 --- a/src/Drivers/Imagick/Image.php +++ b/src/Drivers/Imagick/Image.php @@ -143,11 +143,11 @@ class Image extends AbstractImage implements ImageInterface, Iterator { return $this->pixelToColor( $this->frame($frame_key)->getCore()->getImagePixelColor($x, $y), - $this->getColorspace() + $this->colorspace() ); } - public function getColorspace(): ColorspaceInterface + public function colorspace(): ColorspaceInterface { return match ($this->imagick->getImageColorspace()) { Imagick::COLORSPACE_CMYK => new CmykColorspace(), diff --git a/src/Drivers/Imagick/Modifiers/DrawEllipseModifier.php b/src/Drivers/Imagick/Modifiers/DrawEllipseModifier.php index 3044efaf..cfccd0d7 100644 --- a/src/Drivers/Imagick/Modifiers/DrawEllipseModifier.php +++ b/src/Drivers/Imagick/Modifiers/DrawEllipseModifier.php @@ -14,7 +14,7 @@ class DrawEllipseModifier extends AbstractDrawModifier implements ModifierInterf public function apply(ImageInterface $image): ImageInterface { - $colorspace = $image->getColorspace(); + $colorspace = $image->colorspace(); $background_color = $this->colorToPixel($this->getBackgroundColor(), $colorspace); $border_color = $this->colorToPixel($this->getBorderColor(), $colorspace); diff --git a/src/Drivers/Imagick/Modifiers/DrawLineModifier.php b/src/Drivers/Imagick/Modifiers/DrawLineModifier.php index ab67a0bd..10d2406f 100644 --- a/src/Drivers/Imagick/Modifiers/DrawLineModifier.php +++ b/src/Drivers/Imagick/Modifiers/DrawLineModifier.php @@ -17,7 +17,7 @@ class DrawLineModifier extends AbstractDrawModifier implements ModifierInterface $drawing = new ImagickDraw(); $drawing->setStrokeWidth($this->line()->getWidth()); $drawing->setStrokeColor( - $this->colorToPixel($this->getBackgroundColor(), $image->getColorspace()) + $this->colorToPixel($this->getBackgroundColor(), $image->colorspace()) ); $drawing->line( diff --git a/src/Drivers/Imagick/Modifiers/DrawPixelModifier.php b/src/Drivers/Imagick/Modifiers/DrawPixelModifier.php index 078a34fa..d8e4c250 100644 --- a/src/Drivers/Imagick/Modifiers/DrawPixelModifier.php +++ b/src/Drivers/Imagick/Modifiers/DrawPixelModifier.php @@ -30,7 +30,7 @@ class DrawPixelModifier implements ModifierInterface ); $pixel = new ImagickDraw(); - $pixel->setFillColor($this->colorToPixel($color, $image->getColorspace())); + $pixel->setFillColor($this->colorToPixel($color, $image->colorspace())); $pixel->point($this->position->getX(), $this->position->getY()); return $image->mapFrames(function ($frame) use ($pixel) { diff --git a/src/Drivers/Imagick/Modifiers/DrawPolygonModifier.php b/src/Drivers/Imagick/Modifiers/DrawPolygonModifier.php index 0c14868f..ff5206ae 100644 --- a/src/Drivers/Imagick/Modifiers/DrawPolygonModifier.php +++ b/src/Drivers/Imagick/Modifiers/DrawPolygonModifier.php @@ -22,7 +22,7 @@ class DrawPolygonModifier extends AbstractDrawModifier implements ModifierInterf public function apply(ImageInterface $image): ImageInterface { $drawing = new ImagickDraw(); - $colorspace = $image->getColorspace(); + $colorspace = $image->colorspace(); $background_color = $this->colorToPixel($this->getBackgroundColor(), $colorspace); $border_color = $this->colorToPixel($this->getBorderColor(), $colorspace); diff --git a/src/Drivers/Imagick/Modifiers/DrawRectangleModifier.php b/src/Drivers/Imagick/Modifiers/DrawRectangleModifier.php index 452bc64f..217fd62b 100644 --- a/src/Drivers/Imagick/Modifiers/DrawRectangleModifier.php +++ b/src/Drivers/Imagick/Modifiers/DrawRectangleModifier.php @@ -15,7 +15,7 @@ class DrawRectangleModifier extends AbstractDrawModifier implements ModifierInte public function apply(ImageInterface $image): ImageInterface { $drawing = new ImagickDraw(); - $colorspace = $image->getColorspace(); + $colorspace = $image->colorspace(); $background_color = $this->colorToPixel($this->getBackgroundColor(), $colorspace); $border_color = $this->colorToPixel($this->getBorderColor(), $colorspace); diff --git a/src/Drivers/Imagick/Modifiers/FillModifier.php b/src/Drivers/Imagick/Modifiers/FillModifier.php index 24fd77a3..984a84fd 100644 --- a/src/Drivers/Imagick/Modifiers/FillModifier.php +++ b/src/Drivers/Imagick/Modifiers/FillModifier.php @@ -25,7 +25,7 @@ class FillModifier implements ModifierInterface public function apply(ImageInterface $image): ImageInterface { - $pixel = $this->colorToPixel($this->color, $image->getColorspace()); + $pixel = $this->colorToPixel($this->color, $image->colorspace()); foreach ($image as $frame) { if ($this->hasPosition()) { diff --git a/src/Drivers/Imagick/Modifiers/RotateModifier.php b/src/Drivers/Imagick/Modifiers/RotateModifier.php index 44e5ebad..d8575a66 100644 --- a/src/Drivers/Imagick/Modifiers/RotateModifier.php +++ b/src/Drivers/Imagick/Modifiers/RotateModifier.php @@ -15,7 +15,7 @@ class RotateModifier extends AbstractRotateModifier implements ModifierInterface { foreach ($image as $frame) { $frame->getCore()->rotateImage( - $this->colorToPixel($this->backgroundColor(), $image->getColorspace()), + $this->colorToPixel($this->backgroundColor(), $image->colorspace()), $this->rotationAngle() ); } diff --git a/src/Drivers/Imagick/Modifiers/TextWriter.php b/src/Drivers/Imagick/Modifiers/TextWriter.php index 0d345ed7..668d887a 100644 --- a/src/Drivers/Imagick/Modifiers/TextWriter.php +++ b/src/Drivers/Imagick/Modifiers/TextWriter.php @@ -16,7 +16,7 @@ class TextWriter extends AbstractTextWriter foreach ($image as $frame) { foreach ($lines as $line) { $frame->getCore()->annotateImage( - $font->toImagickDraw($image->getColorspace()), + $font->toImagickDraw($image->colorspace()), $line->getPosition()->getX(), $line->getPosition()->getY(), $font->getAngle(), diff --git a/src/Interfaces/ImageInterface.php b/src/Interfaces/ImageInterface.php index f793ea92..cbd6b464 100644 --- a/src/Interfaces/ImageInterface.php +++ b/src/Interfaces/ImageInterface.php @@ -161,7 +161,7 @@ interface ImageInterface extends Traversable, Countable * * @return ColorspaceInterface */ - public function getColorspace(): ColorspaceInterface; + public function colorspace(): ColorspaceInterface; /** * Transform image to given colorspace diff --git a/tests/Drivers/Gd/ImageTest.php b/tests/Drivers/Gd/ImageTest.php index 96b2fd6b..4d0b0840 100644 --- a/tests/Drivers/Gd/ImageTest.php +++ b/tests/Drivers/Gd/ImageTest.php @@ -126,22 +126,22 @@ class ImageTest extends TestCase public function testGetColorspace(): void { - $this->assertInstanceOf(RgbColorspace::class, $this->image->getColorspace()); + $this->assertInstanceOf(RgbColorspace::class, $this->image->colorspace()); } public function testSetColorspace(): void { $result = $this->image->setColorspace('rgb'); $this->assertInstanceOf(Image::class, $result); - $this->assertInstanceOf(RgbColorspace::class, $result->getColorspace()); + $this->assertInstanceOf(RgbColorspace::class, $result->colorspace()); $result = $this->image->setColorspace(RgbColorspace::class); $this->assertInstanceOf(Image::class, $result); - $this->assertInstanceOf(RgbColorspace::class, $result->getColorspace()); + $this->assertInstanceOf(RgbColorspace::class, $result->colorspace()); $result = $this->image->setColorspace(new RgbColorspace()); $this->assertInstanceOf(Image::class, $result); - $this->assertInstanceOf(RgbColorspace::class, $result->getColorspace()); + $this->assertInstanceOf(RgbColorspace::class, $result->colorspace()); $this->expectException(NotSupportedException::class); $this->image->setColorspace('cmyk'); diff --git a/tests/Drivers/Imagick/Decoders/BinaryImageDecoderTest.php b/tests/Drivers/Imagick/Decoders/BinaryImageDecoderTest.php index 286b1a03..5f990f64 100644 --- a/tests/Drivers/Imagick/Decoders/BinaryImageDecoderTest.php +++ b/tests/Drivers/Imagick/Decoders/BinaryImageDecoderTest.php @@ -15,7 +15,7 @@ class BinaryImageDecoderTest extends TestCase $decoder = new BinaryImageDecoder(); $image = $decoder->decode(file_get_contents($this->getTestImagePath('tile.png'))); $this->assertInstanceOf(Image::class, $image); - $this->assertInstanceOf(RgbColorspace::class, $image->getColorspace()); + $this->assertInstanceOf(RgbColorspace::class, $image->colorspace()); $this->assertEquals(16, $image->width()); $this->assertEquals(16, $image->height()); $this->assertCount(1, $image); @@ -57,6 +57,6 @@ class BinaryImageDecoderTest extends TestCase $decoder = new BinaryImageDecoder(); $image = $decoder->decode(file_get_contents($this->getTestImagePath('cmyk.jpg'))); $this->assertInstanceOf(Image::class, $image); - $this->assertInstanceOf(CmykColorspace::class, $image->getColorspace()); + $this->assertInstanceOf(CmykColorspace::class, $image->colorspace()); } } diff --git a/tests/Drivers/Imagick/ImageTest.php b/tests/Drivers/Imagick/ImageTest.php index 91b40631..096d7bbf 100644 --- a/tests/Drivers/Imagick/ImageTest.php +++ b/tests/Drivers/Imagick/ImageTest.php @@ -99,39 +99,39 @@ class ImageTest extends TestCase $imagick = new Imagick(); $imagick->readImageBlob($this->getTestImageData('test.jpg')); $image = new Image($imagick); - $this->assertInstanceOf(RgbColorspace::class, $image->getColorspace()); + $this->assertInstanceOf(RgbColorspace::class, $image->colorspace()); $imagick = new Imagick(); $imagick->readImageBlob($this->getTestImageData('cmyk.jpg')); $image = new Image($imagick); - $this->assertInstanceOf(CmykColorspace::class, $image->getColorspace()); + $this->assertInstanceOf(CmykColorspace::class, $image->colorspace()); } public function testSetColorspace(): void { $result = $this->image->setColorspace('rgb'); $this->assertInstanceOf(Image::class, $result); - $this->assertInstanceOf(RgbColorspace::class, $result->getColorspace()); + $this->assertInstanceOf(RgbColorspace::class, $result->colorspace()); $result = $this->image->setColorspace(RgbColorspace::class); $this->assertInstanceOf(Image::class, $result); - $this->assertInstanceOf(RgbColorspace::class, $result->getColorspace()); + $this->assertInstanceOf(RgbColorspace::class, $result->colorspace()); $result = $this->image->setColorspace(new RgbColorspace()); $this->assertInstanceOf(Image::class, $result); - $this->assertInstanceOf(RgbColorspace::class, $result->getColorspace()); + $this->assertInstanceOf(RgbColorspace::class, $result->colorspace()); $result = $this->image->setColorspace('cmyk'); $this->assertInstanceOf(Image::class, $result); - $this->assertInstanceOf(CmykColorspace::class, $result->getColorspace()); + $this->assertInstanceOf(CmykColorspace::class, $result->colorspace()); $result = $this->image->setColorspace(CmykColorspace::class); $this->assertInstanceOf(Image::class, $result); - $this->assertInstanceOf(CmykColorspace::class, $result->getColorspace()); + $this->assertInstanceOf(CmykColorspace::class, $result->colorspace()); $result = $this->image->setColorspace(new CmykColorspace()); $this->assertInstanceOf(Image::class, $result); - $this->assertInstanceOf(CmykColorspace::class, $result->getColorspace()); + $this->assertInstanceOf(CmykColorspace::class, $result->colorspace()); } public function testSetGetProfile(): void