Ticket #35725: 35725.21.diff
File 35725.21.diff, 28.0 KB (added by , 4 years ago) |
---|
-
src/wp-admin/includes/image-edit.php
diff --git src/wp-admin/includes/image-edit.php src/wp-admin/includes/image-edit.php index 0430dbefbf..942dffb2e8 100644
function wp_stream_image( $image, $mime_type, $attachment_id ) { 306 306 case 'image/gif': 307 307 header( 'Content-Type: image/gif' ); 308 308 return imagegif( $image ); 309 case 'image/webp': 310 if ( function_exists( 'imagewebp' ) ) { 311 header( 'Content-Type: image/webp' ); 312 return imagewebp( $image, null, 90 ); 313 } 314 return false; 309 315 default: 310 316 return false; 311 317 } … … function wp_save_image_file( $filename, $image, $mime_type, $post_id ) { 391 397 return imagepng( $image, $filename ); 392 398 case 'image/gif': 393 399 return imagegif( $image, $filename ); 400 case 'image/webp': 401 if ( function_exists( 'imagewebp' ) ) { 402 /** 403 * Filters the WebP compression quality for image file saves. 404 * 405 * @since 5.8.0 406 * 407 * @param int $quality Quality level between 0 (low) and 100 (high) of the WebP. 408 */ 409 return imagewebp( $image, null, apply_filters( 'webp_quality', 75 ) ); 410 } 411 return false; 394 412 default: 395 413 return false; 396 414 } -
src/wp-admin/includes/image.php
diff --git src/wp-admin/includes/image.php src/wp-admin/includes/image.php index 673c1dff01..c40f270001 100644
function wp_generate_attachment_metadata( $attachment_id, $file ) { 517 517 case 'image/png': 518 518 $ext = '.png'; 519 519 break; 520 case 'image/webp': 521 $ext = '.webp'; 522 break; 520 523 } 521 524 $basename = str_replace( '.', '-', wp_basename( $file ) ) . '-image' . $ext; 522 525 $uploaded = wp_upload_bits( $basename, '', $metadata['image']['data'] ); … … function file_is_valid_image( $path ) { 913 916 * @return bool True if suitable, false if not suitable. 914 917 */ 915 918 function file_is_displayable_image( $path ) { 916 $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_ICO );919 $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_ICO, IMAGETYPE_WEBP ); // phpcs:ignore PHPCompatibility.Constants.NewConstants.imagetype_webpFound 917 920 918 921 $info = wp_getimagesize( $path ); 919 922 if ( empty( $info ) ) { … … function load_image_to_edit( $attachment_id, $mime_type, $size = 'full' ) { 963 966 case 'image/gif': 964 967 $image = imagecreatefromgif( $filepath ); 965 968 break; 969 case 'image/webp': 970 if ( function_exists( 'imagecreatefromwebp' ) ) { 971 $image = imagecreatefromwebp( $filepath ); 972 } else { 973 $image = false; 974 } 975 break; 966 976 default: 967 977 $image = false; 968 978 break; -
src/wp-admin/includes/media.php
diff --git src/wp-admin/includes/media.php src/wp-admin/includes/media.php index 14a8d99b49..bdfb65d103 100644
function wp_media_upload_handler() { 993 993 function media_sideload_image( $file, $post_id = 0, $desc = null, $return = 'html' ) { 994 994 if ( ! empty( $file ) ) { 995 995 996 $allowed_extensions = array( 'jpg', 'jpeg', 'jpe', 'png', 'gif' );996 $allowed_extensions = array( 'jpg', 'jpeg', 'jpe', 'png', 'gif', 'webp' ); 997 997 998 998 /** 999 999 * Filters the list of allowed file extensions when sideloading an image from a URL. -
src/wp-admin/includes/schema.php
diff --git src/wp-admin/includes/schema.php src/wp-admin/includes/schema.php index a59c7c36ce..6f528f2288 100644
We hope you enjoy your new site. Thanks! 1215 1215 'jpeg', 1216 1216 'png', 1217 1217 'gif', 1218 'webp', 1218 1219 // Video. 1219 1220 'mov', 1220 1221 'avi', -
src/wp-includes/class-wp-image-editor-gd.php
diff --git src/wp-includes/class-wp-image-editor-gd.php src/wp-includes/class-wp-image-editor-gd.php index ed0a7be279..42a8929ff8 100644
class WP_Image_Editor_GD extends WP_Image_Editor { 69 69 return ( $image_types & IMG_PNG ) != 0; 70 70 case 'image/gif': 71 71 return ( $image_types & IMG_GIF ) != 0; 72 case 'image/webp': 73 return ( $image_types & IMG_WEBP ) != 0; // phpcs:ignore PHPCompatibility.Constants.NewConstants.img_webpFound 72 74 } 73 75 74 76 return false; … … class WP_Image_Editor_GD extends WP_Image_Editor { 99 101 return new WP_Error( 'error_loading_image', __( 'File doesn’t exist?' ), $this->file ); 100 102 } 101 103 102 $this->image = @imagecreatefromstring( $file_contents ); 104 // WebP may not work with imagecreatefromstring(). 105 if ( 106 function_exists( 'imagecreatefromwebp' ) && 107 ( 'image/webp' === wp_get_image_mime( $this->file ) ) 108 ) { 109 $this->image = @imagecreatefromwebp( $this->file ); 110 } else { 111 $this->image = @imagecreatefromstring( $file_contents ); 112 } 103 113 104 114 if ( ! is_gd_image( $this->image ) ) { 105 115 return new WP_Error( 'invalid_image', __( 'File is not an image.' ), $this->file ); … … class WP_Image_Editor_GD extends WP_Image_Editor { 459 469 if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) ) { 460 470 return new WP_Error( 'image_save_error', __( 'Image Editor Save Failed' ) ); 461 471 } 472 } elseif ( 'image/webp' == $mime_type ) { 473 if ( ! function_exists( 'imagewebp' ) || ! $this->make_image( $filename, 'imagewebp', array( $image, $filename, $this->get_quality() ) ) ) { 474 return new WP_Error( 'image_save_error', __( 'Image Editor Save Failed' ) ); 475 } 462 476 } else { 463 477 return new WP_Error( 'image_save_error', __( 'Image Editor Save Failed' ) ); 464 478 } … … class WP_Image_Editor_GD extends WP_Image_Editor { 502 516 case 'image/gif': 503 517 header( 'Content-Type: image/gif' ); 504 518 return imagegif( $this->image ); 519 case 'image/webp': 520 if ( function_exists( 'imagewebp' ) ) { 521 header( 'Content-Type: image/webp' ); 522 return imagewebp( $this->image, null, $this->get_quality() ); 523 } 524 // Fall back to the default if webp isn't supported. 505 525 default: 506 526 header( 'Content-Type: image/jpeg' ); 507 527 return imagejpeg( $this->image, null, $this->get_quality() ); -
src/wp-includes/class-wp-image-editor-imagick.php
diff --git src/wp-includes/class-wp-image-editor-imagick.php src/wp-includes/class-wp-image-editor-imagick.php index e4f1ea1b16..36a344b15b 100644
class WP_Image_Editor_Imagick extends WP_Image_Editor { 197 197 } 198 198 199 199 try { 200 if ( 'image/jpeg' === $this->mime_type ) { 201 $this->image->setImageCompressionQuality( $quality ); 202 $this->image->setImageCompression( imagick::COMPRESSION_JPEG ); 203 } else { 204 $this->image->setImageCompressionQuality( $quality ); 200 switch ( $this->mime_type ) { 201 case 'image/jpeg': 202 $this->image->setImageCompressionQuality( $quality ); 203 $this->image->setImageCompression( imagick::COMPRESSION_JPEG ); 204 break; 205 case 'image/webp': 206 if ( _wp_webp_is_lossy( $this->file ) ) { 207 $this->image->setImageCompressionQuality( $quality ); 208 } else { 209 // Use WebP lossless settings. 210 $this->image->setImageCompressionQuality( 100 ); 211 $this->image->setOption( 'webp:lossless', 'true' ); 212 } 213 break; 214 default: 215 $this->image->setImageCompressionQuality( $quality ); 205 216 } 206 217 } catch ( Exception $e ) { 207 218 return new WP_Error( 'image_quality_error', $e->getMessage() ); 208 219 } 209 210 220 return true; 211 221 } 212 222 223 213 224 /** 214 225 * Sets or updates current image size. 215 226 * -
src/wp-includes/class-wp-theme.php
diff --git src/wp-includes/class-wp-theme.php src/wp-includes/class-wp-theme.php index d9ccf6b6ba..b365f45715 100644
final class WP_Theme implements ArrayAccess { 1141 1141 return false; 1142 1142 } 1143 1143 1144 foreach ( array( 'png', 'gif', 'jpg', 'jpeg' ) as $ext ) {1144 foreach ( array( 'png', 'gif', 'jpg', 'jpeg', 'webp' ) as $ext ) { 1145 1145 if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) { 1146 1146 $this->cache_add( 'screenshot', 'screenshot.' . $ext ); 1147 1147 if ( 'relative' === $uri ) { -
src/wp-includes/compat.php
diff --git src/wp-includes/compat.php src/wp-includes/compat.php index 7f6c59f03c..59e5700439 100644
if ( ! function_exists( 'is_iterable' ) ) { 370 370 return ( is_array( $var ) || $var instanceof Traversable ); 371 371 } 372 372 } 373 374 // WebP constants may not be defined, even in cases where the format is supported. 375 if ( ! defined( 'IMAGETYPE_WEBP' ) ) { 376 define( 'IMAGETYPE_WEBP', 18 ); 377 } 378 if ( ! defined( 'IMG_WEBP' ) ) { 379 define( 'IMG_WEBP', IMAGETYPE_WEBP ); // phpcs:ignore PHPCompatibility.Constants.NewConstants.imagetype_webpFound 380 } -
src/wp-includes/customize/class-wp-customize-media-control.php
diff --git src/wp-includes/customize/class-wp-customize-media-control.php src/wp-includes/customize/class-wp-customize-media-control.php index d327a4fa38..22bf75dad5 100644
class WP_Customize_Media_Control extends WP_Customize_Control { 91 91 // Fake an attachment model - needs all fields used by template. 92 92 // Note that the default value must be a URL, NOT an attachment ID. 93 93 $ext = substr( $this->setting->default, -3 ); 94 $type = in_array( $ext, array( 'jpg', 'png', 'gif', 'bmp' ), true ) ? 'image' : 'document';94 $type = in_array( $ext, array( 'jpg', 'png', 'gif', 'bmp', 'webp' ), true ) ? 'image' : 'document'; 95 95 96 96 $default_attachment = array( 97 97 'id' => 1, -
src/wp-includes/deprecated.php
diff --git src/wp-includes/deprecated.php src/wp-includes/deprecated.php index 72a23cd836..2c5f24bde0 100644
function gd_edit_image_support($mime_type) { 3340 3340 return (imagetypes() & IMG_PNG) != 0; 3341 3341 case 'image/gif': 3342 3342 return (imagetypes() & IMG_GIF) != 0; 3343 case 'image/webp': 3344 return (imagetypes() & IMG_WEBP) != 0; // phpcs:ignore PHPCompatibility.Constants.NewConstants.img_webpFound 3343 3345 } 3344 3346 } else { 3345 3347 switch( $mime_type ) { … … function gd_edit_image_support($mime_type) { 3349 3351 return function_exists('imagecreatefrompng'); 3350 3352 case 'image/gif': 3351 3353 return function_exists('imagecreatefromgif'); 3354 case 'image/webp': 3355 return function_exists('imagecreatefromwebp'); 3352 3356 } 3353 3357 } 3354 3358 return false; -
src/wp-includes/formatting.php
diff --git src/wp-includes/formatting.php src/wp-includes/formatting.php index b716c6bc1f..8dda8c738d 100644
function translate_smiley( $matches ) { 3318 3318 3319 3319 $matches = array(); 3320 3320 $ext = preg_match( '/\.([^.]+)$/', $img, $matches ) ? strtolower( $matches[1] ) : false; 3321 $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );3321 $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' ); 3322 3322 3323 3323 // Don't convert smilies that aren't images - they're probably emoji. 3324 3324 if ( ! in_array( $ext, $image_exts, true ) ) { -
src/wp-includes/functions.php
diff --git src/wp-includes/functions.php src/wp-includes/functions.php index 56d5fd9f43..9957bea6b9 100644
function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) { 2886 2886 'image/gif' => 'gif', 2887 2887 'image/bmp' => 'bmp', 2888 2888 'image/tiff' => 'tif', 2889 'image/webp' => 'webp', 2889 2890 ) 2890 2891 ); 2891 2892 … … function wp_get_image_mime( $file ) { 3063 3064 } else { 3064 3065 $mime = false; 3065 3066 } 3067 3068 // Add WebP fallback detection when image library doesn't support WebP. 3069 if ( ! $mime ) { 3070 $handle = fopen( $file, 'rb' ); 3071 if ( $handle ) { 3072 $magic = bin2hex( fread( $handle, 12 ) ); 3073 if ( 3074 // RIFF. 3075 ( 0 === strpos( $magic, '52494646' ) ) && 3076 // WEBP. 3077 ( 16 === strpos( $magic, '57454250' ) ) 3078 ) { 3079 $mime = 'image/webp'; 3080 } 3081 fclose( $handle ); 3082 } 3083 } 3066 3084 } catch ( Exception $e ) { 3067 3085 $mime = false; 3068 3086 } … … function wp_get_mime_types() { 3101 3119 'png' => 'image/png', 3102 3120 'bmp' => 'image/bmp', 3103 3121 'tiff|tif' => 'image/tiff', 3122 'webp' => 'image/webp', 3104 3123 'ico' => 'image/x-icon', 3105 3124 'heic' => 'image/heic', 3106 3125 // Video formats. … … function wp_get_ext_types() { 3222 3241 return apply_filters( 3223 3242 'ext2type', 3224 3243 array( 3225 'image' => array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico', 'heic' ),3244 'image' => array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico', 'heic', 'webp' ), 3226 3245 'audio' => array( 'aac', 'ac3', 'aif', 'aiff', 'flac', 'm3a', 'm4a', 'm4b', 'mka', 'mp1', 'mp2', 'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ), 3227 3246 'video' => array( '3g2', '3gp', '3gpp', 'asf', 'avi', 'divx', 'dv', 'flv', 'm4v', 'mkv', 'mov', 'mp4', 'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt', 'rm', 'vob', 'wmv' ), 3228 3247 'document' => array( 'doc', 'docx', 'docm', 'dotm', 'odt', 'pages', 'pdf', 'xps', 'oxps', 'rtf', 'wp', 'wpd', 'psd', 'xcf' ), -
src/wp-includes/media.php
diff --git src/wp-includes/media.php src/wp-includes/media.php index f5b6a39968..5793def898 100644
function wp_show_heic_upload_error( $plupload_settings ) { 4980 4980 * Allows PHP's getimagesize() to be debuggable when necessary. 4981 4981 * 4982 4982 * @since 5.7.0 4983 * @since 5.8.0 Added support for WebP images. 4983 4984 * 4984 4985 * @param string $filename The file path. 4985 4986 * @param array $image_info Optional. Extended image information (passed by reference). … … function wp_getimagesize( $filename, array &$image_info = null ) { 4994 4995 defined( 'WP_DEBUG' ) && WP_DEBUG 4995 4996 ) { 4996 4997 if ( 2 === func_num_args() ) { 4997 return getimagesize( $filename, $image_info );4998 return _wp_get_image_size( $filename, $image_info ); 4998 4999 } else { 4999 return getimagesize( $filename );5000 return _wp_get_image_size( $filename ); 5000 5001 } 5001 5002 } 5002 5003 … … function wp_getimagesize( $filename, array &$image_info = null ) { 5011 5012 */ 5012 5013 if ( 2 === func_num_args() ) { 5013 5014 // phpcs:ignore WordPress.PHP.NoSilencedErrors 5014 return @ getimagesize( $filename, $image_info );5015 return @_wp_get_image_size( $filename, $image_info ); 5015 5016 } else { 5016 5017 // phpcs:ignore WordPress.PHP.NoSilencedErrors 5017 return @ getimagesize( $filename );5018 return @_wp_get_image_size( $filename ); 5018 5019 } 5019 5020 } 5021 5022 /** 5023 * Extract meta information about a webp file: width, height and type. 5024 * 5025 * @param [type] $filename Path to a WebP file. 5026 * @return array $webp_info { 5027 * An array of WebP image information. 5028 * 5029 * @type array $size { 5030 * @type int $width Image width. 5031 * @type int $height Image height. 5032 * @type bool $type The WebP type: one of 'lossy', 'lossless' or 'animated-alpha'. 5033 * } 5034 5035 */ 5036 function wp_get_webp_info( $filename ) { 5037 if ( ! 'image/webp' === wp_get_image_mime( $filename ) ) { 5038 return array( 5039 'width' => false, 5040 'height' => false, 5041 'type' => false, 5042 ); 5043 } 5044 try { 5045 $handle = fopen( $filename, 'rb' ); 5046 if ( $handle ) { 5047 $magic = fread( $handle, 40 ); 5048 fclose( $handle ); 5049 5050 // Make sure we got enough bytes. 5051 if ( strlen( $magic ) < 40 ) { 5052 return false; 5053 } 5054 5055 $width = false; 5056 $height = false; 5057 $type = false; 5058 5059 // The headers are a little different for each of the three formats. 5060 switch ( substr( $magic, 12, 4 ) ) { 5061 // Lossy WebP. 5062 case 'VP8 ': 5063 $parts = unpack( 'v2', substr( $magic, 26, 4 ) ); 5064 $width = (int) ( $parts[1] & 0x3FFF ); 5065 $height = (int) ( $parts[2] & 0x3FFF ); 5066 $type = 'lossy'; 5067 break; 5068 // Lossless WebP. 5069 case 'VP8L': 5070 $parts = unpack( 'C4', substr( $magic, 21, 4 ) ); 5071 $width = (int) ( $parts[1] | ( ( $parts[2] & 0x3F ) << 8 ) ) + 1; 5072 $height = (int) ( ( ( $parts[2] & 0xC0 ) >> 6 ) | ( $parts[3] << 2 ) | ( ( $parts[4] & 0x03 ) << 10 ) ) + 1; 5073 $type = 'lossless'; 5074 break; 5075 // Animated/alpha WebP. 5076 case 'VP8X': 5077 // Pad 24-bit int. 5078 $width = unpack( 'V', substr( $magic, 24, 3 ) . "\x00" ); 5079 $width = (int) ( $width[1] & 0xFFFFFF ) + 1; 5080 // Pad 24-bit int. 5081 $height = unpack( 'V', substr( $magic, 27, 3 ) . "\x00" ); 5082 $height = (int) ( $height[1] & 0xFFFFFF ) + 1; 5083 $type = 'animated-alpha'; 5084 break; 5085 } 5086 } 5087 } catch ( Exception $e ) { 5088 } 5089 return array( 5090 'width' => $width, 5091 'height' => $height, 5092 'type' => $type, 5093 ); 5094 } 5095 5096 /** 5097 * Determine if a passed image is a lossy WebP image. 5098 * 5099 * @param [type] $filename 5100 * @return void 5101 */ 5102 function _wp_webp_is_lossy( $filename ) { 5103 $webp_info = wp_get_webp_info( $filename ); 5104 $type = isset( $webp_info['type'] ) ? $webp_info['type'] : false; 5105 return $type && 'lossy' === $type; 5106 } 5107 5108 /** 5109 * Get the image size, with support for WebP images. 5110 * 5111 * @since 5.8.0 5112 * @access private 5113 * 5114 * @param string $filename The file path. 5115 * @param array $imageinfo Extended image information, passed by reference. 5116 */ 5117 function _wp_get_image_size( $filename, &$imageinfo = array() ) { 5118 // Try getimagesize() first. 5119 $info = getimagesize( $filename, $imageinfo ); 5120 if ( false !== $info ) { 5121 return $info; 5122 } 5123 // For PHP versions that don't support WebP images, extract the image 5124 // size info from the file headers. 5125 if ( 'image/webp' === wp_get_image_mime( $filename ) ) { 5126 $webp_info = wp_get_webp_info( $filename ); 5127 $width = isset( $webp_info['width'] ) ? $webp_info['width'] : false; 5128 $height = isset( $webp_info['height'] ) ? $webp_info['height'] : false; 5129 5130 // Mimic the native return format. 5131 if ( $width && $height ) { 5132 return array( 5133 $width, 5134 $height, 5135 IMAGETYPE_WEBP, // phpcs:ignore PHPCompatibility.Constants.NewConstants.imagetype_webpFound 5136 sprintf( 5137 'width="%d" height="%d"', 5138 $width, 5139 $height 5140 ), 5141 'mime' => 'image/webp', 5142 ); 5143 } 5144 } 5145 5146 // The image could not be parsed. 5147 return false; 5148 } -
src/wp-includes/post.php
diff --git src/wp-includes/post.php src/wp-includes/post.php index c04f9f78b3..08243e9300 100644
function wp_attachment_is( $type, $post = null ) { 6539 6539 6540 6540 switch ( $type ) { 6541 6541 case 'image': 6542 $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );6542 $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' ); 6543 6543 return in_array( $ext, $image_exts, true ); 6544 6544 6545 6545 case 'audio': -
tests/phpunit/tests/functions.php
diff --git tests/phpunit/data/images/test-image.webp tests/phpunit/data/images/test-image.webp new file mode 100644 index 0000000000..37ab153807 Binary files /dev/null and tests/phpunit/data/images/test-image.webp differ diff --git tests/phpunit/data/images/webp-animated.webp tests/phpunit/data/images/webp-animated.webp new file mode 100644 index 0000000000..c60d334a82 Binary files /dev/null and tests/phpunit/data/images/webp-animated.webp differ diff --git tests/phpunit/data/images/webp-lossless.webp tests/phpunit/data/images/webp-lossless.webp new file mode 100644 index 0000000000..7a3a06e0b4 Binary files /dev/null and tests/phpunit/data/images/webp-lossless.webp differ diff --git tests/phpunit/data/images/webp-lossy.webp tests/phpunit/data/images/webp-lossy.webp new file mode 100644 index 0000000000..c8b0e25391 Binary files /dev/null and tests/phpunit/data/images/webp-lossy.webp differ diff --git tests/phpunit/data/images/webp-transparent.webp tests/phpunit/data/images/webp-transparent.webp new file mode 100644 index 0000000000..c4b24a08be Binary files /dev/null and tests/phpunit/data/images/webp-transparent.webp differ diff --git tests/phpunit/tests/functions.php tests/phpunit/tests/functions.php index f485d3b4ec..75a2ecf5e0 100644
class Tests_Functions extends WP_UnitTestCase { 1225 1225 $this->assertSame( $expected, wp_get_image_mime( $file ) ); 1226 1226 } 1227 1227 1228 /** 1229 * @ticket 35725 1230 * @dataProvider _wp_getimagesize 1231 */ 1232 public function test_wp_getimagesize( $file, $expected ) { 1233 if ( ! is_callable( 'exif_imagetype' ) && ! function_exists( 'getimagesize' ) ) { 1234 $this->markTestSkipped( 'The exif PHP extension is not loaded.' ); 1235 } 1236 1237 $result = wp_getimagesize( $file ); 1238 1239 // The getimagesize() function varies in its response, so 1240 // let's restrict comparison to expected keys only. 1241 if ( is_array( $expected ) ) { 1242 foreach ( $expected as $k => $v ) { 1243 $this->assertEquals( true, isset( $result[ $k ] ) ); 1244 $this->assertEquals( $expected[ $k ], $result[ $k ] ); 1245 } 1246 } else { 1247 $this->assertEquals( $expected, $result ); 1248 } 1249 } 1250 1228 1251 /** 1229 1252 * @ticket 39550 1230 1253 * @dataProvider _wp_check_filetype_and_ext_data … … class Tests_Functions extends WP_UnitTestCase { 1313 1336 DIR_TESTDATA . '/images/test-image-mime-jpg.png', 1314 1337 'image/jpeg', 1315 1338 ), 1339 // Animated WebP. 1340 array( 1341 DIR_TESTDATA . '/images/webp-animated.webp', 1342 'image/webp', 1343 ), 1344 // Lossless WebP. 1345 array( 1346 DIR_TESTDATA . '/images/webp-lossless.webp', 1347 'image/webp', 1348 ), 1349 // Lossy WebP. 1350 array( 1351 DIR_TESTDATA . '/images/webp-lossy.webp', 1352 'image/webp', 1353 ), 1354 // Transparent WebP. 1355 array( 1356 DIR_TESTDATA . '/images/webp-transparent.webp', 1357 'image/webp', 1358 ), 1359 // Not an image. 1360 array( 1361 DIR_TESTDATA . '/uploads/dashicons.woff', 1362 false, 1363 ), 1364 ); 1365 1366 return $data; 1367 } 1368 1369 /** 1370 * Data profider for test_wp_getimagesize(); 1371 */ 1372 public function _wp_getimagesize() { 1373 $data = array( 1374 // Standard JPEG. 1375 array( 1376 DIR_TESTDATA . '/images/test-image.jpg', 1377 array( 1378 50, 1379 50, 1380 IMAGETYPE_JPEG, 1381 'width="50" height="50"', 1382 'mime' => 'image/jpeg', 1383 ), 1384 ), 1385 // Standard GIF. 1386 array( 1387 DIR_TESTDATA . '/images/test-image.gif', 1388 array( 1389 50, 1390 50, 1391 IMAGETYPE_GIF, 1392 'width="50" height="50"', 1393 'mime' => 'image/gif', 1394 ), 1395 ), 1396 // Standard PNG. 1397 array( 1398 DIR_TESTDATA . '/images/test-image.png', 1399 array( 1400 50, 1401 50, 1402 IMAGETYPE_PNG, 1403 'width="50" height="50"', 1404 'mime' => 'image/png', 1405 ), 1406 ), 1407 // Image with wrong extension. 1408 array( 1409 DIR_TESTDATA . '/images/test-image-mime-jpg.png', 1410 array( 1411 50, 1412 50, 1413 IMAGETYPE_JPEG, 1414 'width="50" height="50"', 1415 'mime' => 'image/jpeg', 1416 ), 1417 ), 1418 // Animated WebP. 1419 array( 1420 DIR_TESTDATA . '/images/webp-animated.webp', 1421 array( 1422 100, 1423 100, 1424 IMAGETYPE_WEBP, 1425 'width="100" height="100"', 1426 'mime' => 'image/webp', 1427 ), 1428 ), 1429 // Lossless WebP. 1430 array( 1431 DIR_TESTDATA . '/images/webp-lossless.webp', 1432 array( 1433 1200, 1434 675, 1435 IMAGETYPE_WEBP, 1436 'width="1200" height="675"', 1437 'mime' => 'image/webp', 1438 ), 1439 ), 1440 // Lossy WebP. 1441 array( 1442 DIR_TESTDATA . '/images/webp-lossy.webp', 1443 array( 1444 1200, 1445 675, 1446 IMAGETYPE_WEBP, 1447 'width="1200" height="675"', 1448 'mime' => 'image/webp', 1449 ), 1450 ), 1451 // Transparent WebP. 1452 array( 1453 DIR_TESTDATA . '/images/webp-transparent.webp', 1454 array( 1455 1200, 1456 675, 1457 IMAGETYPE_WEBP, 1458 'width="1200" height="675"', 1459 'mime' => 'image/webp', 1460 ), 1461 ), 1316 1462 // Not an image. 1317 1463 array( 1318 1464 DIR_TESTDATA . '/uploads/dashicons.woff', -
tests/phpunit/tests/image/editor.php
diff --git tests/phpunit/tests/image/editor.php tests/phpunit/tests/image/editor.php index 47ee30a658..42061d4da4 100644
class Tests_Image_Editor extends WP_Image_UnitTestCase { 195 195 196 196 $this->assertSame( '100x50', $editor->get_suffix() ); 197 197 } 198 199 /** 200 * Test wp_get_webp_info. 201 * 202 * @ticket 35725 203 * @dataProvider _test_wp_get_webp_info 204 * 205 */ 206 public function test_wp_get_webp_info( $file, $expected ) { 207 $editor = wp_get_image_editor( $file ); 208 if ( is_wp_error( $editor ) || ! $editor->supports_mime_type( 'image/webp' ) ) { 209 $this->markTestSkipped( sprintf( 'Skipping test: no WebP support in the editor engine %s on this system.', $this->editor_engine ) ); 210 } else { 211 $file_data = wp_get_webp_info( $file ); 212 $this->assertSame( $file_data, $expected ); 213 } 214 } 215 216 /** 217 * Data provider for test_wp_get_webp_info(); 218 */ 219 public function _test_wp_get_webp_info() { 220 return array( 221 // Standard JPEG. 222 array( 223 DIR_TESTDATA . '/images/test-image.jpg', 224 array( 225 'width' => false, 226 'height' => false, 227 'type' => false, 228 ), 229 ), 230 // Standard GIF. 231 array( 232 DIR_TESTDATA . '/images/test-image.gif', 233 array( 234 'width' => false, 235 'height' => false, 236 'type' => false, 237 ), 238 ), 239 // Animated WebP. 240 array( 241 DIR_TESTDATA . '/images/webp-animated.webp', 242 array( 243 'width' => 100, 244 'height' => 100, 245 'type' => 'animated-alpha', 246 ), 247 ), 248 // Lossless WebP. 249 array( 250 DIR_TESTDATA . '/images/webp-lossless.webp', 251 array( 252 'width' => 1200, 253 'height' => 675, 254 'type' => 'lossless', 255 ), 256 ), 257 // Lossy WebP. 258 array( 259 DIR_TESTDATA . '/images/webp-lossy.webp', 260 array( 261 'width' => 1200, 262 'height' => 675, 263 'type' => 'lossy', 264 ), 265 ), 266 // Transparent WebP. 267 array( 268 DIR_TESTDATA . '/images/webp-transparent.webp', 269 array( 270 'width' => 1200, 271 'height' => 675, 272 'type' => 'animated-alpha', 273 ), 274 ), 275 ); 276 } 277 198 278 } -
tests/phpunit/tests/image/functions.php
diff --git tests/phpunit/tests/image/functions.php tests/phpunit/tests/image/functions.php index 1694c1e7f1..0658e45117 100644
class Tests_Image_Functions extends WP_UnitTestCase { 59 59 'test-image.psd', 60 60 'test-image-zip.tiff', 61 61 'test-image.jpg', 62 'webp-animated.webp', 63 'webp-lossless.webp', 64 'webp-lossy.webp', 65 'webp-transparent.webp', 62 66 ); 63 67 64 68 // IMAGETYPE_ICO is only defined in PHP 5.3+. … … class Tests_Image_Functions extends WP_UnitTestCase { 92 96 'test-image.jpg', 93 97 ); 94 98 99 // Add WebP images if the image editor supports them. 100 $file = DIR_TESTDATA . '/images/test-image.webp'; 101 $editor = wp_get_image_editor( $file ); 102 if ( ( ! is_wp_error( $editor ) ) && $editor->supports_mime_type( 'image/webp' ) ) { 103 $files = array_merge( 104 $files, 105 array( 106 'webp-animated.webp', 107 'webp-lossless.webp', 108 'webp-lossy.webp', 109 'webp-transparent.webp', 110 ) 111 ); 112 } 113 95 114 // IMAGETYPE_ICO is only defined in PHP 5.3+. 96 115 if ( defined( 'IMAGETYPE_ICO' ) ) { 97 116 $files[] = 'test-image.ico'; … … class Tests_Image_Functions extends WP_UnitTestCase { 174 193 'image/png', 175 194 ); 176 195 196 // Include WebP in tests when platform supports it. 197 if ( function_exists( 'imagewebp' ) ) { 198 array_push( $mime_types, 'image/webp' ); 199 } 200 177 201 // Test each image editor engine. 178 202 foreach ( $classes as $class ) { 179 203 $img = new $class( DIR_TESTDATA . '/images/canola.jpg' ); … … class Tests_Image_Functions extends WP_UnitTestCase { 270 294 'jpe' => 'image/jpeg', 271 295 'gif' => 'image/gif', 272 296 'png' => 'image/png', 273 'unk' => 'image/jpeg', // Default, unknown. 297 'webp' => 'image/webp', 298 'unk' => 'image/jpeg', // Default, unknown. 274 299 ); 275 300 276 301 // Test each image editor engine. -
tests/phpunit/tests/image/resize.php
diff --git tests/phpunit/tests/image/resize.php tests/phpunit/tests/image/resize.php index 3e3255e6a5..517ab45389 100644
abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase 64 64 unlink( $image ); 65 65 } 66 66 67 function test_resize_webp() { 68 $file = DIR_TESTDATA . '/images/test-image.webp'; 69 $editor = wp_get_image_editor( $file ); 70 71 // Check if the editor supports the webp mime type. 72 if ( is_wp_error( $editor ) || ! $editor->supports_mime_type( 'image/webp' ) ) { 73 $this->markTestSkipped( sprintf( 'Skipping test: no WebP support in the editor engine %s on this system.', $this->editor_engine ) ); 74 } else { 75 $image = $this->resize_helper( $file, 25, 25 ); 76 $this->assertSame( 'test-image-25x25.webp', wp_basename( $image ) ); 77 list($w, $h, $type) = wp_getimagesize( $image ); 78 $this->assertSame( 25, $w ); 79 $this->assertSame( 25, $h ); 80 $this->assertSame( IMAGETYPE_WEBP, $type ); 81 unlink( $image ); 82 } 83 } 84 67 85 function test_resize_larger() { 68 86 // image_resize() should refuse to make an image larger. 69 87 $image = $this->resize_helper( DIR_TESTDATA . '/images/test-image.jpg', 100, 100 );