Image: added support for WEBP [Closes #73]

Author: dg

src/Utils/Image.php

@@ -108,14 +108,15 @@ class Image
 	const
 		JPEG = IMAGETYPE_JPEG,
 		PNG = IMAGETYPE_PNG,
-		GIF = IMAGETYPE_GIF;
+		GIF = IMAGETYPE_GIF,
+		WEBP = 18; // IMAGETYPE_WEBP is available as of PHP 7.1
 
 	const EMPTY_GIF = "GIF89a\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00!\xf9\x04\x01\x00\x00\x00\x00,\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02D\x01\x00;";
 
 	/** @deprecated */
 	const ENLARGE = 0;
 
-	static private $formats = [self::JPEG => 'jpeg', self::PNG => 'png', self::GIF => 'gif'];
+	static private $formats = [self::JPEG => 'jpeg', self::PNG => 'png', self::GIF => 'gif', self::WEBP => 'webp'];
 
 	/** @var resource */
 	private $image;
@@ -155,6 +156,9 @@ public static function fromFile($file, & $format = NULL)
 		}
 
 		$format = @getimagesize($file)[2]; // @ - files smaller than 12 bytes causes read error
+		if (!$format && PHP_VERSION_ID < 70100 && @file_get_contents($file, FALSE, NULL, 8, 4) === 'WEBP') { // @ - may not exists
+			$format = self::WEBP;
+		}
 		if (!isset(self::$formats[$format])) {
 			$format = NULL;
 			throw new UnknownImageFileException(is_file($file) ? "Unknown type of file '$file'." : "File '$file' not found.");
@@ -510,7 +514,7 @@ public function place(Image $image, $left = 0, $top = 0, $opacity = 100)
 	/**
 	 * Saves image to the file.
 	 * @param  string  filename
-	 * @param  int  quality 0..100 (for JPEG and PNG)
+	 * @param  int  quality (0..100 for JPEG and WEBP, 0..9 for PNG)
 	 * @param  int  optional image type
 	 * @return bool TRUE on success or FALSE on failure.
 	 */
@@ -537,6 +541,10 @@ public function save($file = NULL, $quality = NULL, $type = NULL)
 			case self::GIF:
 				return imagegif($this->image, $file);
 
+			case self::WEBP:
+				$quality = $quality === NULL ? 80 : max(0, min(100, (int) $quality));
+				return imagewebp($this->image, $file, $quality);
+
 			default:
 				throw new Nette\InvalidArgumentException("Unsupported image type '$type'.");
 		}
@@ -546,7 +554,7 @@ public function save($file = NULL, $quality = NULL, $type = NULL)
 	/**
 	 * Outputs image to string.
 	 * @param  int  image type
-	 * @param  int  quality 0..100 (for JPEG and PNG)
+	 * @param  int  quality (0..100 for JPEG and WEBP, 0..9 for PNG)
 	 * @return string
 	 */
 	public function toString($type = self::JPEG, $quality = NULL)
@@ -580,7 +588,7 @@ public function __toString()
 	/**
 	 * Outputs image to browser.
 	 * @param  int  image type
-	 * @param  int  quality 0..100 (for JPEG and PNG)
+	 * @param  int  quality (0..100 for JPEG and WEBP, 0..9 for PNG)
 	 * @return bool TRUE on success or FALSE on failure.
 	 */
 	public function send($type = self::JPEG, $quality = NULL)

tests/Utils/Image.factories.phpt

@@ -24,6 +24,17 @@ test(function () {
 });
 
 
+test(function () {
+	if (!function_exists('imagecreatefromwebp')) {
+		return;
+	}
+	$image = Image::fromFile(__DIR__ . '/images/logo.webp', $format);
+	Assert::same(176, $image->getWidth());
+	Assert::same(104, $image->getHeight());
+	Assert::same(Image::WEBP, $format);
+});
+
+
 Assert::exception(function () {
 	Image::fromFile('images/missing.png');
 }, Nette\Utils\UnknownImageFileException::class, "File 'images/missing.png' not found.");

tests/Utils/Image.save.phpt

@@ -33,6 +33,21 @@ test(function () use ($main) {
 });
 
 
+test(function () use ($main) {
+	if (!function_exists('imagewebp')) {
+		return;
+	}
+
+	$main->save(TEMP_DIR . '/foo.webp');
+	Assert::true(is_file(TEMP_DIR . '/foo.webp'));
+	Assert::same('WEBP', file_get_contents(TEMP_DIR . '/foo.webp', FALSE, NULL, 8, 4));
+
+	$main->save(TEMP_DIR . '/foo.y', NULL, Image::WEBP);
+	Assert::true(is_file(TEMP_DIR . '/foo.y'));
+	Assert::same('WEBP', file_get_contents(TEMP_DIR . '/foo.y', FALSE, NULL, 8, 4));
+});
+
+
 Assert::exception(function () use ($main) { // invalid image type
 	$main->save('foo', NULL, IMG_WBMP);
 }, Nette\InvalidArgumentException::class, sprintf('Unsupported image type \'%d\'.', IMG_WBMP));

tests/Utils/Image.send.phpt

@@ -43,6 +43,22 @@ test(function () use ($main) {
 });
 
 
+test(function () use ($main) {
+	if (!function_exists('imagewebp')) {
+		return;
+	}
+
+	ob_start();
+	$main->send(Image::WEBP);
+	$data = ob_get_clean();
+
+	Assert::contains('WEBP', $data);
+	if (PHP_SAPI !== 'cli') {
+		Assert::contains('Content-Type: image/webp', headers_list());
+	}
+});
+
+
 Assert::exception(function () use ($main) { // invalid image type
 	$main->send(IMG_WBMP);
 }, Nette\InvalidArgumentException::class, sprintf('Unsupported image type \'%d\'.', IMG_WBMP));