Fix a bug in ImagickDriver::pixelate that caused a DivideByZero excep…

…tion.
spatie · Jun 30, 2024 · 0687d1b · 0687d1b
1 parent c15fa28
commit 0687d1b
Show file tree

Hide file tree

Showing 30 changed files with 23 additions and 15 deletions.
diff --git a/src/Drivers/Imagick/ImagickDriver.php b/src/Drivers/Imagick/ImagickDriver.php
@@ -223,7 +223,7 @@ public function resizeCanvas(
 
         // make image area transparent to keep transparency
         // even if background-color is set
-        $rect = new ImagickDraw;
+        $rect = new ImagickDraw();
         $fill = $canvas->pickColor(0, 0, ColorFormat::Hex);
         $fill = $fill === '#ff0000' ? '#00ff00' : '#ff0000';
         $rect->setFillColor($fill);
@@ -470,12 +470,14 @@ public function flip(FlipDirection $flip): static
 
     public function pixelate(int $pixelate = 50): static
     {
-        $width = $this->getWidth();
-        $height = $this->getHeight();
+        if ($pixelate !== 0) {
+            $width = $this->getWidth();
+            $height = $this->getHeight();
 
-        foreach ($this->image as $image) {
-            $image->scaleImage(max(1, (int) ($width / $pixelate)), max(1, (int) ($height / $pixelate)));
-            $image->scaleImage($width, $height);
+            foreach ($this->image as $image) {
+                $image->scaleImage(max(1, (int) ($width / $pixelate)), max(1, (int) ($height / $pixelate)));
+                $image->scaleImage($width, $height);
+            }
         }
 
         return $this;

diff --git a/tests/Manipulations/BlurTest.php b/tests/Manipulations/BlurTest.php
@@ -5,13 +5,13 @@
 
 use function Spatie\Snapshots\assertMatchesImageSnapshot;
 
-it('can blur an image', function (ImageDriver $driver) {
+it('can blur an image', function (ImageDriver $driver, int $blur) {
     $targetFile = $this->tempDir->path("{$driver->driverName()}/blur.png");
 
-    $driver->loadFile(getTestJpg())->blur(50)->save($targetFile);
+    $driver->loadFile(getTestJpg())->blur($blur)->save($targetFile);
 
     assertMatchesImageSnapshot($targetFile);
-})->with('drivers');
+})->with('drivers', [0, 50, 100]);
 
 it('will throw an exception when passing an invalid blur value', function (ImageDriver $driver) {
     $driver->loadFile(getTestJpg())->blur(101);

diff --git a/tests/Manipulations/PixelateTest.php b/tests/Manipulations/PixelateTest.php
@@ -2,12 +2,18 @@
 
 use Spatie\Image\Drivers\ImageDriver;
 
+use Spatie\Image\Exceptions\InvalidManipulation;
+
 use function Spatie\Snapshots\assertMatchesImageSnapshot;
 
-it('can pixelate an image', function (ImageDriver $driver) {
+it('can pixelate an image', function (ImageDriver $driver, int $pixelate) {
     $targetFile = $this->tempDir->path("{$driver->driverName()}/pixelate.png");
 
-    $driver->loadFile(getTestJpg())->pixelate()->save($targetFile);
+    $driver->loadFile(getTestJpg())->pixelate($pixelate)->save($targetFile);
 
     assertMatchesImageSnapshot($targetFile);
-})->with('drivers');
+})->with('drivers', [0, 50, 100]);
+
+it('will throw an exception when passing an invalid pixelate value', function (ImageDriver $driver) {
+    $driver->loadFile(getTestJpg())->pixelate(101);
+})->with('drivers')->throws(InvalidManipulation::class);
diff --git a/tests/Manipulations/SharpenTest.php b/tests/Manipulations/SharpenTest.php
@@ -5,13 +5,13 @@
 
 use function Spatie\Snapshots\assertMatchesImageSnapshot;
 
-it('can sharpen an image', function (ImageDriver $driver) {
+it('can sharpen an image', function (ImageDriver $driver, int $sharpen) {
     $targetFile = $this->tempDir->path("{$driver->driverName()}/sharpen.png");
 
-    $driver->loadFile(getTestJpg())->sharpen(50)->save($targetFile);
+    $driver->loadFile(getTestJpg())->sharpen($sharpen)->save($targetFile);
 
     assertMatchesImageSnapshot($targetFile);
-})->with('drivers');
+})->with('drivers', [0, 50, 100]);
 
 it('will throw an exception when passing an invalid sharpen value', function (ImageDriver $driver) {
     $driver->loadFile(getTestJpg())->sharpen(101);

diff --git a/...snapshots__/BlurTest__it_can_blur_an_image_with_data_set_dataset_gd__(0)__1.png b/...snapshots__/BlurTest__it_can_blur_an_image_with_data_set_dataset_gd__(0)__1.png
diff --git a/...apshots__/BlurTest__it_can_blur_an_image_with_data_set_dataset_gd__(100)__1.png b/...apshots__/BlurTest__it_can_blur_an_image_with_data_set_dataset_gd__(100)__1.png
diff --git a/...napshots__/BlurTest__it_can_blur_an_image_with_data_set_dataset_gd__(50)__1.png b/...napshots__/BlurTest__it_can_blur_an_image_with_data_set_dataset_gd__(50)__1.png
diff --git a/...hots__/BlurTest__it_can_blur_an_image_with_data_set_dataset_imagick__(0)__1.png b/...hots__/BlurTest__it_can_blur_an_image_with_data_set_dataset_imagick__(0)__1.png
diff --git a/...ts__/BlurTest__it_can_blur_an_image_with_data_set_dataset_imagick__(100)__1.png b/...ts__/BlurTest__it_can_blur_an_image_with_data_set_dataset_imagick__(100)__1.png
diff --git a/...ots__/BlurTest__it_can_blur_an_image_with_data_set_dataset_imagick__(50)__1.png b/...ots__/BlurTest__it_can_blur_an_image_with_data_set_dataset_imagick__(50)__1.png
diff --git a/...ith_data_set_dataset_gd__(SpatieImageEnumsOrientation_Enum_(Rotate0,_0))__1.png b/...ith_data_set_dataset_gd__(SpatieImageEnumsOrientation_Enum_(Rotate0,_0))__1.png
diff --git a/...data_set_dataset_gd__(SpatieImageEnumsOrientation_Enum_(Rotate180,_180))__1.png b/...data_set_dataset_gd__(SpatieImageEnumsOrientation_Enum_(Rotate180,_180))__1.png
diff --git a/...data_set_dataset_gd__(SpatieImageEnumsOrientation_Enum_(Rotate270,_270))__1.png b/...data_set_dataset_gd__(SpatieImageEnumsOrientation_Enum_(Rotate270,_270))__1.png
diff --git a/...h_data_set_dataset_gd__(SpatieImageEnumsOrientation_Enum_(Rotate90,_90))__1.png b/...h_data_set_dataset_gd__(SpatieImageEnumsOrientation_Enum_(Rotate90,_90))__1.png
diff --git a/...ata_set_dataset_imagick__(SpatieImageEnumsOrientation_Enum_(Rotate0,_0))__1.png b/...ata_set_dataset_imagick__(SpatieImageEnumsOrientation_Enum_(Rotate0,_0))__1.png
diff --git a/...set_dataset_imagick__(SpatieImageEnumsOrientation_Enum_(Rotate180,_180))__1.png b/...set_dataset_imagick__(SpatieImageEnumsOrientation_Enum_(Rotate180,_180))__1.png
diff --git a/...set_dataset_imagick__(SpatieImageEnumsOrientation_Enum_(Rotate270,_270))__1.png b/...set_dataset_imagick__(SpatieImageEnumsOrientation_Enum_(Rotate270,_270))__1.png
diff --git a/...a_set_dataset_imagick__(SpatieImageEnumsOrientation_Enum_(Rotate90,_90))__1.png b/...a_set_dataset_imagick__(SpatieImageEnumsOrientation_Enum_(Rotate90,_90))__1.png
diff --git a/...s__/PixelateTest__it_can_pixelate_an_image_with_data_set_dataset_gd__(0)__1.png b/...s__/PixelateTest__it_can_pixelate_an_image_with_data_set_dataset_gd__(0)__1.png
diff --git a/..._/PixelateTest__it_can_pixelate_an_image_with_data_set_dataset_gd__(100)__1.png b/..._/PixelateTest__it_can_pixelate_an_image_with_data_set_dataset_gd__(100)__1.png
diff --git a/...__/PixelateTest__it_can_pixelate_an_image_with_data_set_dataset_gd__(50)__1.png b/...__/PixelateTest__it_can_pixelate_an_image_with_data_set_dataset_gd__(50)__1.png
diff --git a/...ixelateTest__it_can_pixelate_an_image_with_data_set_dataset_imagick__(0)__1.png b/...ixelateTest__it_can_pixelate_an_image_with_data_set_dataset_imagick__(0)__1.png
diff --git a/...elateTest__it_can_pixelate_an_image_with_data_set_dataset_imagick__(100)__1.png b/...elateTest__it_can_pixelate_an_image_with_data_set_dataset_imagick__(100)__1.png
diff --git a/...xelateTest__it_can_pixelate_an_image_with_data_set_dataset_imagick__(50)__1.png b/...xelateTest__it_can_pixelate_an_image_with_data_set_dataset_imagick__(50)__1.png
diff --git a/...ots__/SharpenTest__it_can_sharpen_an_image_with_data_set_dataset_gd__(0)__1.png b/...ots__/SharpenTest__it_can_sharpen_an_image_with_data_set_dataset_gd__(0)__1.png
diff --git a/...s__/SharpenTest__it_can_sharpen_an_image_with_data_set_dataset_gd__(100)__1.png b/...s__/SharpenTest__it_can_sharpen_an_image_with_data_set_dataset_gd__(100)__1.png
diff --git a/...ts__/SharpenTest__it_can_sharpen_an_image_with_data_set_dataset_gd__(50)__1.png b/...ts__/SharpenTest__it_can_sharpen_an_image_with_data_set_dataset_gd__(50)__1.png
diff --git a/.../SharpenTest__it_can_sharpen_an_image_with_data_set_dataset_imagick__(0)__1.png b/.../SharpenTest__it_can_sharpen_an_image_with_data_set_dataset_imagick__(0)__1.png
diff --git a/...harpenTest__it_can_sharpen_an_image_with_data_set_dataset_imagick__(100)__1.png b/...harpenTest__it_can_sharpen_an_image_with_data_set_dataset_imagick__(100)__1.png
diff --git a/...SharpenTest__it_can_sharpen_an_image_with_data_set_dataset_imagick__(50)__1.png b/...SharpenTest__it_can_sharpen_an_image_with_data_set_dataset_imagick__(50)__1.png