From 00e7956d2184c369c9fe7b83b157f81f857cc864 Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Sun, 22 Jun 2025 08:03:37 +0200 Subject: [PATCH] Rename methods in ImageManager::class --- src/ImageManager.php | 14 +++++++------- src/Interfaces/ImageManagerInterface.php | 14 +++++++------- tests/Feature/Gd/ConvertPngGif.php | 2 +- tests/Feature/Imagick/ConvertPngGif.php | 2 +- tests/Unit/ImageManagerTestGd.php | 24 ++++++++++++------------ tests/Unit/ImageManagerTestImagick.php | 24 ++++++++++++------------ 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/ImageManager.php b/src/ImageManager.php index 94371bbb..f6bc2e21 100644 --- a/src/ImageManager.php +++ b/src/ImageManager.php @@ -89,7 +89,7 @@ final class ImageManager implements ImageManagerInterface * * @see ImageManagerInterface::create() */ - public function createFromPath(string $path): ImageInterface + public function decodeFromPath(string $path): ImageInterface { return $this->driver->handleInput($path, [FilePathImageDecoder::class]); } @@ -99,7 +99,7 @@ final class ImageManager implements ImageManagerInterface * * @see ImageManagerInterface::createFromBinary() */ - public function createFromBinary(string $data): ImageInterface + public function decodeFromBinary(string $data): ImageInterface { return $this->driver->handleInput($data, [BinaryImageDecoder::class]); } @@ -109,7 +109,7 @@ final class ImageManager implements ImageManagerInterface * * @see ImageManagerInterface::createFromBase64() */ - public function createFromBase64(string $data): ImageInterface + public function decodeFromBase64(string $data): ImageInterface { return $this->driver->handleInput($data, [Base64ImageDecoder::class]); } @@ -119,7 +119,7 @@ final class ImageManager implements ImageManagerInterface * * @see ImageManagerInterface::createFromDataUri() */ - public function createFromDataUri(string $uri): ImageInterface + public function decodeFromDataUri(string $uri): ImageInterface { return $this->driver->handleInput($uri, [DataUriImageDecoder::class]); } @@ -129,7 +129,7 @@ final class ImageManager implements ImageManagerInterface * * @see ImageManagerInterface::createFromStream() */ - public function createFromStream(mixed $stream): ImageInterface + public function decodeFromStream(mixed $stream): ImageInterface { return $this->driver->handleInput($stream, [FilePointerImageDecoder::class]); } @@ -139,7 +139,7 @@ final class ImageManager implements ImageManagerInterface * * @see ImageManagerInterface::createFromSplFileInfo() */ - public function createFromSplFileInfo(SplFileInfo $file): ImageInterface + public function decodeFromSplFileInfo(SplFileInfo $file): ImageInterface { return $this->driver->handleInput($file, [SplFileInfoImageDecoder::class]); } @@ -149,7 +149,7 @@ final class ImageManager implements ImageManagerInterface * * @see ImageManagerInterface::read() */ - public function read(mixed $input, string|array|DecoderInterface $decoders = []): ImageInterface + public function decode(mixed $input, string|array|DecoderInterface $decoders = []): ImageInterface { return $this->driver->handleInput( $input, diff --git a/src/Interfaces/ImageManagerInterface.php b/src/Interfaces/ImageManagerInterface.php index cd477554..81f13091 100644 --- a/src/Interfaces/ImageManagerInterface.php +++ b/src/Interfaces/ImageManagerInterface.php @@ -24,42 +24,42 @@ interface ImageManagerInterface * * @throws DecoderException */ - public function createFromPath(string $path): ImageInterface; + public function decodeFromPath(string $path): ImageInterface; /** * Create new image instance from given image binary data * * @throws DecoderException */ - public function createFromBinary(string $data): ImageInterface; + public function decodeFromBinary(string $data): ImageInterface; /** * Create new image instance from given base64 encoded image data * * @throws DecoderException */ - public function createFromBase64(string $data): ImageInterface; + public function decodeFromBase64(string $data): ImageInterface; /** * Create new image instance from given data uri encoded image data * * @throws DecoderException */ - public function createFromDataUri(string $uri): ImageInterface; + public function decodeFromDataUri(string $uri): ImageInterface; /** * Create new image instance from given image stream resource * * @throws DecoderException */ - public function createFromStream(mixed $stream): ImageInterface; + public function decodeFromStream(mixed $stream): ImageInterface; /** * Create new image instance from given SplFileInfo image object * * @throws DecoderException */ - public function createFromSplFileInfo(SplFileInfo $file): ImageInterface; + public function decodeFromSplFileInfo(SplFileInfo $file): ImageInterface; /** * Create new image instance from given input which can be one of the following @@ -89,7 +89,7 @@ interface ImageManagerInterface * @param string|array|DecoderInterface $decoders * @throws RuntimeException */ - public function read(mixed $input, string|array|DecoderInterface $decoders = []): ImageInterface; + public function decode(mixed $input, string|array|DecoderInterface $decoders = []): ImageInterface; /** * Create new animated image by given callback diff --git a/tests/Feature/Gd/ConvertPngGif.php b/tests/Feature/Gd/ConvertPngGif.php index 11a590bb..071d18a3 100644 --- a/tests/Feature/Gd/ConvertPngGif.php +++ b/tests/Feature/Gd/ConvertPngGif.php @@ -14,7 +14,7 @@ class ConvertPngGif extends GdTestCase public function testConversionKeepsTransparency(): void { $converted = ImageManager::gd() - ->read( + ->decode( $this->readTestImage('circle.png')->toGif() ); diff --git a/tests/Feature/Imagick/ConvertPngGif.php b/tests/Feature/Imagick/ConvertPngGif.php index cb34ab8e..107071b8 100644 --- a/tests/Feature/Imagick/ConvertPngGif.php +++ b/tests/Feature/Imagick/ConvertPngGif.php @@ -14,7 +14,7 @@ class ConvertPngGif extends ImagickTestCase public function testConversionKeepsTransparency(): void { $converted = ImageManager::imagick() - ->read( + ->decode( $this->readTestImage('circle.png')->toGif() ); diff --git a/tests/Unit/ImageManagerTestGd.php b/tests/Unit/ImageManagerTestGd.php index 15e7066d..61b618f2 100644 --- a/tests/Unit/ImageManagerTestGd.php +++ b/tests/Unit/ImageManagerTestGd.php @@ -67,42 +67,42 @@ final class ImageManagerTestGd extends BaseTestCase public function testRead(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('red.gif')); + $image = $manager->decode($this->getTestResourcePath('red.gif')); $this->assertInstanceOf(ImageInterface::class, $image); } public function testReadWithDecoderClassname(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('red.gif'), FilePathImageDecoder::class); + $image = $manager->decode($this->getTestResourcePath('red.gif'), FilePathImageDecoder::class); $this->assertInstanceOf(ImageInterface::class, $image); } public function testReadWithDecoderInstance(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('red.gif'), new FilePathImageDecoder()); + $image = $manager->decode($this->getTestResourcePath('red.gif'), new FilePathImageDecoder()); $this->assertInstanceOf(ImageInterface::class, $image); } public function testReadWithDecoderClassnameArray(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('red.gif'), [FilePathImageDecoder::class]); + $image = $manager->decode($this->getTestResourcePath('red.gif'), [FilePathImageDecoder::class]); $this->assertInstanceOf(ImageInterface::class, $image); } public function testReadWithDecoderInstanceArray(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('red.gif'), [new FilePathImageDecoder()]); + $image = $manager->decode($this->getTestResourcePath('red.gif'), [new FilePathImageDecoder()]); $this->assertInstanceOf(ImageInterface::class, $image); } public function testReadWithDecoderInstanceArrayMultiple(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('red.gif'), [ + $image = $manager->decode($this->getTestResourcePath('red.gif'), [ new BinaryImageDecoder(), new FilePathImageDecoder(), ]); @@ -112,35 +112,35 @@ final class ImageManagerTestGd extends BaseTestCase public function testReadWithRotationAdjustment(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('orientation.jpg')); + $image = $manager->decode($this->getTestResourcePath('orientation.jpg')); $this->assertColor(1, 0, 254, 255, $image->pickColor(3, 3)); } public function testReadWithoutRotationAdjustment(): void { $manager = new ImageManager(Driver::class, autoOrientation: false); - $image = $manager->read($this->getTestResourcePath('orientation.jpg')); + $image = $manager->decode($this->getTestResourcePath('orientation.jpg')); $this->assertColor(250, 2, 3, 255, $image->pickColor(3, 3)); } public function testReadAnimation(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('animation.gif')); + $image = $manager->decode($this->getTestResourcePath('animation.gif')); $this->assertTrue($image->isAnimated()); } public function testReadAnimationDiscarded(): void { $manager = new ImageManager(Driver::class, decodeAnimation: false); - $image = $manager->read($this->getTestResourcePath('animation.gif')); + $image = $manager->decode($this->getTestResourcePath('animation.gif')); $this->assertFalse($image->isAnimated()); } public function testApplyBackgroundColorDefault(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('blocks.png')); + $image = $manager->decode($this->getTestResourcePath('blocks.png')); $result = $image->background(); $this->assertColor(255, 255, 255, 255, $image->pickColor(530, 0)); $this->assertColor(255, 255, 255, 255, $result->pickColor(530, 0)); @@ -149,7 +149,7 @@ final class ImageManagerTestGd extends BaseTestCase public function testApplyBackgroundColorConfigured(): void { $manager = new ImageManager(Driver::class, backgroundColor: 'ff5500'); - $image = $manager->read($this->getTestResourcePath('blocks.png')); + $image = $manager->decode($this->getTestResourcePath('blocks.png')); $result = $image->background(); $this->assertColor(255, 85, 0, 255, $image->pickColor(530, 0)); $this->assertColor(255, 85, 0, 255, $result->pickColor(530, 0)); diff --git a/tests/Unit/ImageManagerTestImagick.php b/tests/Unit/ImageManagerTestImagick.php index 7239f2b5..ca4e924c 100644 --- a/tests/Unit/ImageManagerTestImagick.php +++ b/tests/Unit/ImageManagerTestImagick.php @@ -67,42 +67,42 @@ final class ImageManagerTestImagick extends BaseTestCase public function testRead(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('red.gif')); + $image = $manager->decode($this->getTestResourcePath('red.gif')); $this->assertInstanceOf(ImageInterface::class, $image); } public function testReadWithDecoderClassname(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('red.gif'), FilePathImageDecoder::class); + $image = $manager->decode($this->getTestResourcePath('red.gif'), FilePathImageDecoder::class); $this->assertInstanceOf(ImageInterface::class, $image); } public function testReadWithDecoderInstance(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('red.gif'), new FilePathImageDecoder()); + $image = $manager->decode($this->getTestResourcePath('red.gif'), new FilePathImageDecoder()); $this->assertInstanceOf(ImageInterface::class, $image); } public function testReadWithDecoderClassnameArray(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('red.gif'), [FilePathImageDecoder::class]); + $image = $manager->decode($this->getTestResourcePath('red.gif'), [FilePathImageDecoder::class]); $this->assertInstanceOf(ImageInterface::class, $image); } public function testReadWithDecoderInstanceArray(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('red.gif'), [new FilePathImageDecoder()]); + $image = $manager->decode($this->getTestResourcePath('red.gif'), [new FilePathImageDecoder()]); $this->assertInstanceOf(ImageInterface::class, $image); } public function testReadWithDecoderInstanceArrayMultiple(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('red.gif'), [ + $image = $manager->decode($this->getTestResourcePath('red.gif'), [ new BinaryImageDecoder(), new FilePathImageDecoder(), ]); @@ -112,35 +112,35 @@ final class ImageManagerTestImagick extends BaseTestCase public function testReadWithRotationAdjustment(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('orientation.jpg')); + $image = $manager->decode($this->getTestResourcePath('orientation.jpg')); $this->assertColor(1, 0, 254, 255, $image->pickColor(3, 3)); } public function testReadWithoutRotationAdjustment(): void { $manager = new ImageManager(Driver::class, autoOrientation: false); - $image = $manager->read($this->getTestResourcePath('orientation.jpg')); + $image = $manager->decode($this->getTestResourcePath('orientation.jpg')); $this->assertColor(250, 2, 3, 255, $image->pickColor(3, 3)); } public function testReadAnimation(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('animation.gif')); + $image = $manager->decode($this->getTestResourcePath('animation.gif')); $this->assertTrue($image->isAnimated()); } public function testReadAnimationDiscarded(): void { $manager = new ImageManager(Driver::class, decodeAnimation: false); - $image = $manager->read($this->getTestResourcePath('animation.gif')); + $image = $manager->decode($this->getTestResourcePath('animation.gif')); $this->assertFalse($image->isAnimated()); } public function testApplyBackgroundColor(): void { $manager = new ImageManager(Driver::class); - $image = $manager->read($this->getTestResourcePath('blocks.png')); + $image = $manager->decode($this->getTestResourcePath('blocks.png')); $result = $image->background(); $this->assertColor(255, 255, 255, 255, $image->pickColor(530, 0)); $this->assertColor(255, 255, 255, 255, $result->pickColor(530, 0)); @@ -149,7 +149,7 @@ final class ImageManagerTestImagick extends BaseTestCase public function testApplyBackgroundColorConfigured(): void { $manager = new ImageManager(Driver::class, backgroundColor: 'ff5500'); - $image = $manager->read($this->getTestResourcePath('blocks.png')); + $image = $manager->decode($this->getTestResourcePath('blocks.png')); $result = $image->background(); $this->assertColor(255, 85, 0, 255, $image->pickColor(530, 0)); $this->assertColor(255, 85, 0, 255, $result->pickColor(530, 0));