Merge pull request #776 from mlocati/gd-resize-filter

Make the $filter parameter of the resize method invariant

Author: mlocati

src/Gd/Image.php

@@ -184,12 +184,14 @@ final public function paste(ImageInterface $image, PointInterface $start, $alpha
     /**
      * {@inheritdoc}
      *
+     * Please remark that GD doesn't support different filters, so the $filter argument is ignored.
+     *
      * @see \Imagine\Image\ManipulatorInterface::resize()
      */
     final public function resize(BoxInterface $size, $filter = ImageInterface::FILTER_UNDEFINED)
     {
-        if ($filter !== ImageInterface::FILTER_UNDEFINED) {
-            throw new InvalidArgumentException('Unsupported filter type, GD only supports ImageInterface::FILTER_UNDEFINED filter');
+        if (!in_array($filter, static::getAllFilterValues(), true)) {
+            throw new InvalidArgumentException('Unsupported filter type');
         }
 
         $width = $size->getWidth();

src/Gmagick/Image.php

@@ -222,6 +222,9 @@ public function paste(ImageInterface $image, PointInterface $start, $alpha = 100
      */
     public function resize(BoxInterface $size, $filter = ImageInterface::FILTER_UNDEFINED)
     {
+        if (!in_array($filter, static::getAllFilterValues(), true)) {
+            throw new InvalidArgumentException('Unsupported filter type');
+        }
         static $supportedFilters = array(
             ImageInterface::FILTER_UNDEFINED => \Gmagick::FILTER_UNDEFINED,
             ImageInterface::FILTER_BESSEL => \Gmagick::FILTER_BESSEL,
@@ -242,7 +245,7 @@ public function resize(BoxInterface $size, $filter = ImageInterface::FILTER_UNDE
         );
 
         if (!array_key_exists($filter, $supportedFilters)) {
-            throw new InvalidArgumentException('Unsupported filter type');
+            $filter = ImageInterface::FILTER_UNDEFINED;
         }
 
         try {

src/Image/AbstractImage.php

@@ -168,6 +168,28 @@ protected function updateSaveOptions(array $options)
         return $options;
     }
 
+    /**
+     * Get all the available filter defined in ImageInterface.
+     *
+     * @return string[]
+     */
+    protected static function getAllFilterValues()
+    {
+        static $result;
+        if (!is_array($result)) {
+            $values = array();
+            $interface = new \ReflectionClass('Imagine\Image\ImageInterface');
+            foreach ($interface->getConstants() as $name => $value) {
+                if (strpos($name, 'FILTER_') === 0) {
+                    $values[] = $value;
+                }
+            }
+            $result = $values;
+        }
+
+        return $result;
+    }
+
     /**
      * {@inheritdoc}
      *

src/Imagick/Image.php

@@ -1095,12 +1095,11 @@ private function getFilter($filter = ImageInterface::FILTER_UNDEFINED)
             ImageInterface::FILTER_SINC => \Imagick::FILTER_SINC,
             ImageInterface::FILTER_TRIANGLE => \Imagick::FILTER_TRIANGLE,
         );
-
+        if (!in_array($filter, static::getAllFilterValues(), true)) {
+            throw new InvalidArgumentException('Unsupported filter type');
+        }
         if (!array_key_exists($filter, $supportedFilters)) {
-            throw new InvalidArgumentException(sprintf(
-                'The resampling filter "%s" is not supported by Imagick driver.',
-                $filter
-            ));
+            $filter = ImageInterface::FILTER_UNDEFINED;
         }
 
         return $supportedFilters[$filter];