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

.github/workflows/dependabot-auto-merge.yml

@@ -13,7 +13,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.1.0
+        uses: dependabot/fetch-metadata@v2.2.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           compat-lookup: true

src/Drivers/Imagick/ImagickDriver.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Spatie\Image\Drivers\Imagick;
 
 use Imagick;
@@ -56,13 +58,6 @@ public function new(int $width, int $height, ?string $backgroundColor = null): s
         return (new self())->setImage($image);
     }
 
-    protected function setImage(Imagick $image): static
-    {
-        $this->image = $image;
-
-        return $this;
-    }
-
     public function image(): Imagick
     {
         return $this->image;
@@ -88,11 +83,6 @@ public function loadFile(string $path, bool $autoRotate = true): static
         return $this;
     }
 
-    protected function isAnimated(): bool
-    {
-        return count($this->image) > 1;
-    }
-
     public function getWidth(): int
     {
         return $this->image->getImageWidth();
@@ -133,7 +123,7 @@ public function fit(
         }
 
         if ($fit === Fit::FillMax) {
-            if (is_null($desiredWidth) || is_null($desiredHeight)) {
+            if (null === $desiredWidth || null === $desiredHeight) {
                 throw new MissingParameter('Both desiredWidth and desiredHeight must be set when using Fit::FillMax');
             }
 
@@ -223,7 +213,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);
@@ -265,7 +255,7 @@ public function save(?string $path = null): static
             $formats[] = 'JFIF';
         }
 
-        if (! in_array(strtoupper($extension), $formats)) {
+        if (! in_array(mb_strtoupper($extension), $formats)) {
             throw UnsupportedImageFormat::make($extension);
         }
 
@@ -354,7 +344,7 @@ public function manualCrop(int $width, int $height, ?int $x = null, ?int $y = nu
         $cropped = new Size($width, $height);
         $position = new Point($x ?? 0, $y ?? 0);
 
-        if (is_null($x) && is_null($y)) {
+        if (null === $x && null === $y) {
             $position = $this
                 ->getSize()
                 ->align(AlignPosition::Center)
@@ -429,7 +419,7 @@ public function overlay(ImageDriver $bottomImage, ImageDriver $topImage, int $x
 
     public function orientation(?Orientation $orientation = null): static
     {
-        if (is_null($orientation)) {
+        if (null === $orientation) {
             $orientation = $this->getOrientationFromExif($this->exif);
         }
 
@@ -470,6 +460,10 @@ public function flip(FlipDirection $flip): static
 
     public function pixelate(int $pixelate = 50): static
     {
+        if ($pixelate === 0) {
+            return $this;
+        }
+
         $width = $this->getWidth();
         $height = $this->getHeight();
 
@@ -722,4 +716,16 @@ public function wrapText(string $text, int $fontSize, string $fontPath = '', int
 
         return $wrapped;
     }
+
+    protected function setImage(Imagick $image): static
+    {
+        $this->image = $image;
+
+        return $this;
+    }
+
+    protected function isAnimated(): bool
+    {
+        return count($this->image) > 1;
+    }
 }

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);

tests/Manipulations/PixelateTest.php

@@ -1,13 +1,20 @@
 <?php
 
 use Spatie\Image\Drivers\ImageDriver;
+use Spatie\Image\Exceptions\InvalidManipulation;
+
+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);

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);