Modernisation - Make ImageFilter aware of GdImage

Author: nibra

src/ImageFilter.php

@@ -21,7 +21,7 @@
 abstract class ImageFilter implements LoggerAwareInterface
 {
 	/**
-	 * @var    resource  The image resource handle.
+	 * @var    resource|\GdImage  The image resource handle.
 	 * @since  1.0
 	 */
 	protected $handle;
@@ -35,7 +35,7 @@ abstract class ImageFilter implements LoggerAwareInterface
 	/**
 	 * Class constructor.
 	 *
-	 * @param   resource  $handle  The image resource on which to apply the filter.
+	 * @param   resource|\GdImage  $handle  The image resource on which to apply the filter.
 	 *
 	 * @since   1.0
 	 * @throws  \InvalidArgumentException
@@ -55,7 +55,7 @@ public function __construct($handle)
 		}
 
 		// Make sure the file handle is valid.
-		if (!\is_resource($handle) || (get_resource_type($handle) != 'gd'))
+		if (!$this->isValidImage($handle))
 		{
 			$this->getLogger()->error('The image handle is invalid for the image filter.');
 
@@ -88,7 +88,7 @@ public function getLogger()
 	 *
 	 * @param   LoggerInterface  $logger  A PSR-3 compliant logger.
 	 *
-	 * @return  Image  This object for message chaining.
+	 * @return  ImageFilter  This object for message chaining.
 	 *
 	 * @since   1.0
 	 */
@@ -109,4 +109,16 @@ public function setLogger(LoggerInterface $logger)
 	 * @since   1.0
 	 */
 	abstract public function execute(array $options = array());
+
+	/**
+	 * @param   mixed  $handle  A potential image handle
+	 *
+	 * @return  boolean
+	 */
+	private function isValidImage($handle)
+	{
+		// @todo Remove resource check, once PHP7 support is dropped.
+		return (\is_resource($handle) && \get_resource_type($handle) === 'gd')
+			   || (\is_object($handle) && $handle instanceof \GDImage);
+	}
 }