Add bestfit option

Author: chadicus

src/Image.php

@@ -30,6 +30,7 @@ public static function resize(\Imagick $source, int $boxWidth, int $boxHeight, a
      *
      * @throws \InvalidArgumentException if $options["color"] was not a string
      * @throws \InvalidArgumentException if $options["upsize"] was not a bool
+     * @throws \InvalidArgumentException if $options["bestfit"] was not a bool
      * @throws \InvalidArgumentException if $options["maxWidth"] was not an int
      * @throws \InvalidArgumentException if $options["maxHeight"] was not an int
      * @throws \InvalidArgumentException if a width in a $boxSizes value was not an int
@@ -60,6 +61,14 @@ public static function resizeMulti(\Imagick $source, array $boxSizes, array $opt
             }
         }
 
+        $bestfit = false;
+        if (isset($options['bestfit'])) {
+            $bestfit = $options['bestfit'];
+            if ($bestfit !== true && $bestfit !== false) {
+                throw new \InvalidArgumentException('$options["bestfit"] was not a bool');
+            }
+        }
+
         $maxWidth = 10000;
         if (isset($options['maxWidth'])) {
             $maxWidth = $options['maxWidth'];
@@ -198,7 +207,7 @@ public static function resizeMulti(\Imagick $source, array $boxSizes, array $opt
             }
 
             if ($upsize && ($width < $targetWidth || $height < $targetHeight)) {
-                if ($clone->resizeImage($targetWidth, $targetHeight, \Imagick::FILTER_CUBIC, 1.0) !== true) {
+                if ($clone->resizeImage($targetWidth, $targetHeight, \Imagick::FILTER_CUBIC, 1.0, $bestfit) !== true) {
                     //cumbersome to test
                     throw new \Exception('Imagick::resizeImage() did not return true');//@codeCoverageIgnore
                 }

tests/ImageTest.php

@@ -215,6 +215,21 @@ public function resizeUpsizeToMoreVerticalAspect()
         $this->assertLessThan(0.1, $imageBottom['luminosity']);
     }
 
+    /**
+     * @test
+     * @covers ::resize
+     * @covers ::resizeMulti
+     */
+    public function resizeWithUpsizeAndBestFit()
+    {
+        $source = new \Imagick('pattern:gray0');
+        $source->scaleImage(85, 45);
+        $notBestFit = Image::resize($source, 300, 300, ['upsize' => true, 'bestfit' => false]);
+        $this->assertSame('srgb(0,0,0)', $notBestFit->getImagePixelColor(299, 100)->getColorAsString());
+        $bestFit = Image::resize($source, 300, 300, ['upsize' => true, 'bestfit' => true]);
+        $this->assertSame('srgb(255,255,255)', $bestFit->getImagePixelColor(299, 100)->getColorAsString());
+    }
+
     /**
      * @test
      * @covers ::resize
@@ -311,6 +326,18 @@ public function resizeNonBoolUpsize()
         Image::resize(new \Imagick(), 10, 10, ['upsize' => 'not bool']);
     }
 
+    /**
+     * @test
+     * @covers ::resize
+     * @covers ::resizeMulti
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage $options["bestfit"] was not a bool
+     */
+    public function resizeNonBoolBestFit()
+    {
+        Image::resize(new \Imagick(), 10, 10, ['bestfit' => 'not bool']);
+    }
+
     /**
      * Verify images are rotated according to EXIF header
      * @test