Image: catches all errors during saving

Author: dg

src/Utils/Image.php

@@ -718,42 +718,27 @@ public function send(int $type = ImageType::JPEG, ?int $quality = null): void
 	 */
 	private function output(int $type, ?int $quality, ?string $file = null): void
 	{
-		switch ($type) {
-			case ImageType::JPEG:
-				$quality = $quality === null ? 85 : max(0, min(100, $quality));
-				$success = @imagejpeg($this->image, $file, $quality); // @ is escalated to exception
-				break;
-
-			case ImageType::PNG:
-				$quality = $quality === null ? 9 : max(0, min(9, $quality));
-				$success = @imagepng($this->image, $file, $quality); // @ is escalated to exception
-				break;
-
-			case ImageType::GIF:
-				$success = @imagegif($this->image, $file); // @ is escalated to exception
-				break;
-
-			case ImageType::WEBP:
-				$quality = $quality === null ? 80 : max(0, min(100, $quality));
-				$success = @imagewebp($this->image, $file, $quality); // @ is escalated to exception
-				break;
-
-			case ImageType::AVIF:
-				$quality = $quality === null ? 30 : max(0, min(100, $quality));
-				$success = @imageavif($this->image, $file, $quality); // @ is escalated to exception
-				break;
-
-			case ImageType::BMP:
-				$success = @imagebmp($this->image, $file); // @ is escalated to exception
-				break;
-
-			default:
-				throw new Nette\InvalidArgumentException("Unsupported image type '$type'.");
-		}
-
-		if (!$success) {
-			throw new ImageException(Helpers::getLastError() ?: 'Unknown error');
-		}
+		[$defQuality, $min, $max] = match ($type) {
+			ImageType::JPEG => [85, 0, 100],
+			ImageType::PNG => [9, 0, 9],
+			ImageType::GIF => [null, null, null],
+			ImageType::WEBP => [80, 0, 100],
+			ImageType::AVIF => [30, 0, 100],
+			ImageType::BMP => [null, null, null],
+			default => throw new Nette\InvalidArgumentException("Unsupported image type '$type'."),
+		};
+
+		$args = [$this->image, $file];
+		if ($defQuality !== null) {
+			$args[] = $quality === null ? $defQuality : max($min, min($max, $quality));
+		}
+
+		Callback::invokeSafe('image' . self::Formats[$type], $args, function (string $message) use ($file): void {
+			if ($file !== null) {
+				@unlink($file);
+			}
+			throw new ImageException($message);
+		});
 	}
 
 

tests/Utils/Image.save.phpt

@@ -88,3 +88,21 @@ Assert::exception(
 	Nette\InvalidArgumentException::class,
 	'Unsupported file extension \'psd\'.',
 );
+
+
+test('saving palette-based as WEBP should fail without creating file', function () {
+	if (!Image::isTypeSupported(Image::WEBP) || PHP_VERSION_ID < 80200) {
+		return;
+	}
+
+	$paletteImage = Image::fromFile(__DIR__ . '/fixtures.images/logo.gif');
+	$filename = getTempDir() . '/palette-test.webp';
+
+	Assert::exception(
+		fn() => $paletteImage->save($filename),
+		Nette\Utils\ImageException::class,
+		'Palette %a%',
+	);
+
+	Assert::false(is_file($filename));
+});