Merge branch 'develop' of https://github.com/nicojmb/CodeIgniter4 int…

…o webp_support
codeigniter4 · Jun 27, 2020 · eaf9f02 · eaf9f02
2 parents 275ee07 + dd5edd7
commit eaf9f02
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
@@ -325,6 +325,17 @@ public function save(string $target = null, int $quality = 90): bool
 					throw ImageException::forSaveFailed();
 				}
 				break;
+			case IMAGETYPE_WEBP:
+				if (! function_exists('imagewebp'))
+				{
+					throw ImageException::forInvalidImageCreate(lang('images.webpNotSupported'));
+				}
+
+				if (! @imagewebp($this->resource, $target))
+				{
+					throw ImageException::forSaveFailed();
+				}
+				break;	
 			default:
 				throw ImageException::forInvalidImageCreate();
 		}
@@ -389,6 +400,13 @@ protected function createImage(string $path = '', string $imageType = '')
 				}
 
 				return imagecreatefrompng($path);
+			case IMAGETYPE_WEBP:
+				if (! function_exists('imagecreatefromwebp'))
+				{
+					throw ImageException::forInvalidImageCreate(lang('images.webpNotSupported'));
+				}
+
+				return imagecreatefromwebp($path);	
 			default:
 				throw ImageException::forInvalidImageCreate('Ima');
 		}
@@ -416,6 +434,9 @@ protected function ensureResource()
 				case IMAGETYPE_PNG:
 					$this->resource = imagecreatefrompng($path);
 					break;
+				case IMAGETYPE_WEBP:
+					$this->resource = imagecreatefromwebp($path);
+					break;	
 			}
 		}
 	}

diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
@@ -361,6 +361,16 @@ protected function getResourcePath()
 	protected function ensureResource()
 	{
 		$this->getResourcePath();
+
+		switch ($this->image()->imageType)
+		{
+			case IMAGETYPE_WEBP:
+				if (! in_array('WEBP', \Imagick::queryFormats()))
+				{
+					throw ImageException::forInvalidImageCreate(lang('images.webpNotSupported'));
+				}
+				break;	
+		}
 	}
 
 	//--------------------------------------------------------------------

diff --git a/system/Images/Image.php b/system/Images/Image.php
@@ -145,7 +145,8 @@ public function getProperties(bool $return = false)
 		$types = [
 			1 => 'gif',
 			2 => 'jpeg',
-			3 => 'png',
+			4 => 'png',
+			32 => 'webp'
 		];
 
 		$mime = 'image/' . ($types[$vals[2]] ?? 'jpg');

diff --git a/system/Language/en/Images.php b/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.',
+   'webpNotSupported'       => 'WEBP 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.',