Add exception for unsupported files; move check to Image

Author: MGatner

system/Images/Exceptions/ImageException.php

@@ -10,6 +10,11 @@ public static function forMissingImage()
 		return new static(lang('Images.sourceImageRequired'));
 	}
 
+	public static function forFileNotSupported()
+	{
+		return new static(lang('Images.fileNotSupported'));
+	}
+
 	public static function forMissingAngle()
 	{
 		return new static(lang('Images.rotationAngleRequired'));

system/Images/Handlers/BaseHandler.php

@@ -242,7 +242,7 @@ protected function image(): ?Image
 		// File::__construct has verified the file exists - make sure it is an image
 		if (! is_int($this->image->imageType))
 		{
-			throw ImageException::forInvalidPath();
+			throw ImageException::forFileNotSupported();
 		}
 
 		// Note that the image has been verified

system/Images/Image.php

@@ -137,7 +137,11 @@ public function getProperties(bool $return = false)
 	{
 		$path = $this->getPathname();
 
-		$vals  = getimagesize($path);
+		if (! $vals = getimagesize($path))
+		{
+			throw ImageException::forFileNotSupported();
+		}
+
 		$types = [
 			1 => 'gif',
 			2 => 'jpeg',

system/Language/en/Images.php

@@ -21,6 +21,7 @@
    'gifNotSupported'        => 'GIF images are often not supported due to licensing restrictions. You may have to use JPG or PNG images instead.',
    'jpgNotSupported'        => 'JPG images are not supported.',
    'pngNotSupported'        => 'PNG images are not supported.',
+   'fileNotSupported'       => 'The supplied file is not a supported image type.',
    'unsupportedImageCreate' => 'Your server does not support the GD function required to process this type of image.',
    'jpgOrPngRequired'       => 'The image resize protocol specified in your preferences only works with JPEG or PNG image types.',
    'rotateUnsupported'      => 'Image rotation does not appear to be supported by your server.',