From 6cff224934062786ff9d7ca0f5e55b2fe7f6e6ac Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Sun, 22 Oct 2023 15:12:04 +0200 Subject: [PATCH] Rename methods --- src/Drivers/Gd/Image.php | 2 +- src/Drivers/Gd/Traits/CanHandleColors.php | 2 +- src/Drivers/Imagick/Image.php | 2 +- src/Drivers/Imagick/Traits/CanHandleColors.php | 2 +- tests/Drivers/Imagick/Traits/CanHandleColorsTest.php | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Drivers/Gd/Image.php b/src/Drivers/Gd/Image.php index afb573a2..2e34f3d0 100644 --- a/src/Drivers/Gd/Image.php +++ b/src/Drivers/Gd/Image.php @@ -75,7 +75,7 @@ class Image extends AbstractImage implements ImageInterface, IteratorAggregate public function pickColor(int $x, int $y, int $frame_key = 0): ?ColorInterface { if ($frame = $this->getFrame($frame_key)) { - return $this->colorFromInteger( + return $this->integerToColor( imagecolorat($frame->getCore(), $x, $y) ); } diff --git a/src/Drivers/Gd/Traits/CanHandleColors.php b/src/Drivers/Gd/Traits/CanHandleColors.php index 799292df..1ed34b65 100644 --- a/src/Drivers/Gd/Traits/CanHandleColors.php +++ b/src/Drivers/Gd/Traits/CanHandleColors.php @@ -12,7 +12,7 @@ trait CanHandleColors * @param int $value * @return Color */ - public function colorFromInteger(int $value): Color + public function integerToColor(int $value): Color { $a = ($value >> 24) & 0xFF; $r = ($value >> 16) & 0xFF; diff --git a/src/Drivers/Imagick/Image.php b/src/Drivers/Imagick/Image.php index d8c3d0a3..e98e78a5 100644 --- a/src/Drivers/Imagick/Image.php +++ b/src/Drivers/Imagick/Image.php @@ -131,7 +131,7 @@ class Image extends AbstractImage implements ImageInterface, Iterator public function pickColor(int $x, int $y, int $frame_key = 0): ?ColorInterface { if ($frame = $this->getFrame($frame_key)) { - return $this->colorFromPixel( + return $this->pixelToColor( $frame->getCore()->getImagePixelColor($x, $y), $this->getColorspace() ); diff --git a/src/Drivers/Imagick/Traits/CanHandleColors.php b/src/Drivers/Imagick/Traits/CanHandleColors.php index 6b248128..7d9fab1b 100644 --- a/src/Drivers/Imagick/Traits/CanHandleColors.php +++ b/src/Drivers/Imagick/Traits/CanHandleColors.php @@ -27,7 +27,7 @@ trait CanHandleColors * @param ColorspaceInterface $colorspace * @return ColorInterface */ - public function colorFromPixel(ImagickPixel $pixel, ColorspaceInterface $colorspace): ColorInterface + public function pixelToColor(ImagickPixel $pixel, ColorspaceInterface $colorspace): ColorInterface { return match (get_class($colorspace)) { CmykColorspace::class => $colorspace->colorFromNormalized([ diff --git a/tests/Drivers/Imagick/Traits/CanHandleColorsTest.php b/tests/Drivers/Imagick/Traits/CanHandleColorsTest.php index eaf36170..f9c66411 100644 --- a/tests/Drivers/Imagick/Traits/CanHandleColorsTest.php +++ b/tests/Drivers/Imagick/Traits/CanHandleColorsTest.php @@ -28,16 +28,16 @@ class CanHandleColorsTest extends TestCase public function testColorFromPixel(): void { $result = $this->getAnonymousTrait() - ->colorFromPixel(new ImagickPixel(), new RgbColorspace()); + ->pixelToColor(new ImagickPixel(), new RgbColorspace()); $this->assertInstanceOf(RgbColor::class, $result); $result = $this->getAnonymousTrait() - ->colorFromPixel(new ImagickPixel('rgba(10, 20, 30, .2)'), new RgbColorspace()); + ->pixelToColor(new ImagickPixel('rgba(10, 20, 30, .2)'), new RgbColorspace()); $this->assertInstanceOf(RgbColor::class, $result); $this->assertEquals([10, 20, 30, 51], $result->toArray()); $result = $this->getAnonymousTrait() - ->colorFromPixel(new ImagickPixel('cmyk(10%, 20%, 30%, 40%)'), new CmykColorspace()); + ->pixelToColor(new ImagickPixel('cmyk(10%, 20%, 30%, 40%)'), new CmykColorspace()); $this->assertInstanceOf(CmykColor::class, $result); $this->assertEquals([10, 20, 30, 40], $result->toArray()); }