mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-03-11 23:49:54 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Media: Some documentation and test improvements for WebP support:

Browse Source 
* Document that WebP constants are only defined in PHP 7.1+.
* Correct the `$filename` parameter type in `wp_get_webp_info()`.
* Use a consistent message when skipping tests due to the lack of WebP support.
* Remove unnecessary `else` branches after `markTestSkipped()`.
* Replace `assertEquals()` with more appropriate assertions.

Follow-up to [50810].

See #35725.

git-svn-id: https://develop.svn.wordpress.org/trunk@50814 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2021-05-05 17:06:17 +00:00
parent 596a24c692
commit 462560edba
7 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/compat.php
View File

@ -371,7 +371,7 @@ if ( ! function_exists( 'is_iterable' ) ) {
}
}
// WebP constants may not be defined, even in cases where the format is supported.
// WebP constants are only defined in PHP 7.1+.
if ( ! defined( 'IMAGETYPE_WEBP' ) ) {
define( 'IMAGETYPE_WEBP', 18 );
}

8
src/wp-includes/functions.php
View File

@ -3079,9 +3079,11 @@ function wp_get_image_mime( $file ) {
return false;
}
// Add WebP fallback detection when image library doesn't support WebP.
// Note: detection values come from LibWebP, see
// https://github.com/webmproject/libwebp/blob/master/imageio/image_dec.c#L30
/*
* Add WebP fallback detection when image library doesn't support WebP.
* Note: detection values come from LibWebP, see
* https://github.com/webmproject/libwebp/blob/master/imageio/image_dec.c#L30
*/
$magic = bin2hex( $magic );
if (
// RIFF.

14
src/wp-includes/media.php
View File

@ -5024,7 +5024,7 @@ function wp_getimagesize( $filename, array &$image_info = null ) {
*
* @since 5.8.0
*
* @param [type] $filename Path to a WebP file.
* @param string $filename Path to a WebP file.
* @return array $webp_info {
* An array of WebP image information.
*
@ -5038,9 +5038,11 @@ function wp_get_webp_info( $filename ) {
$width = false;
$height = false;
$type = false;
if ( ! 'image/webp' === wp_get_image_mime( $filename ) ) {
return compact( 'width', 'height', 'type' );
}
try {
$handle = fopen( $filename, 'rb' );
if ( $handle ) {
@ -5083,6 +5085,7 @@ function wp_get_webp_info( $filename ) {
}
} catch ( Exception $e ) {
}
return compact( 'width', 'height', 'type' );
}
@ -5097,6 +5100,7 @@ function wp_get_webp_info( $filename ) {
function _wp_webp_is_lossy( $filename ) {
$webp_info = wp_get_webp_info( $filename );
$type = $webp_info['type'];
return $type && 'lossy' === $type;
}
@ -5113,17 +5117,19 @@ function _wp_webp_is_lossy( $filename ) {
function _wp_get_image_size( $filename, &$imageinfo = array() ) {
// Try getimagesize() first.
$info = getimagesize( $filename, $imageinfo );
if ( false !== $info ) {
return $info;
}
// For PHP versions that don't support WebP images, extract the image
// size info from the file headers.
// For PHP versions that don't support WebP images,
// extract the image size info from the file headers.
if ( 'image/webp' === wp_get_image_mime( $filename ) ) {
$webp_info = wp_get_webp_info( $filename );
$width = $webp_info['width'];
$height = $webp_info['height'];
// Mimic the native return format.
// Mimic the native return format.
if ( $width && $height ) {
return array(
$width,

10
tests/phpunit/tests/functions.php
View File

@ -1240,11 +1240,11 @@ class Tests_Functions extends WP_UnitTestCase {
// let's restrict comparison to expected keys only.
if ( is_array( $expected ) ) {
foreach ( $expected as $k => $v ) {
$this->assertEquals( true, isset( $result[ $k ] ) );
$this->assertEquals( $expected[ $k ], $result[ $k ] );
$this->assertArrayHasKey( $k, $result );
$this->assertSame( $expected[ $k ], $result[ $k ] );
}
} else {
$this->assertEquals( $expected, $result );
$this->assertSame( $expected, $result );
}
}
@ -1312,7 +1312,7 @@ class Tests_Functions extends WP_UnitTestCase {
}
/**
* Data provider for test_wp_get_image_mime();
* Data provider for test_wp_get_image_mime().
*/
public function _wp_get_image_mime() {
$data = array(
@ -1367,7 +1367,7 @@ class Tests_Functions extends WP_UnitTestCase {
}
/**
* Data profider for test_wp_getimagesize();
* Data profider for test_wp_getimagesize().
*/
public function data_wp_getimagesize() {
$data = array(

11
tests/phpunit/tests/image/editor.php
View File

@ -205,16 +205,17 @@ class Tests_Image_Editor extends WP_Image_UnitTestCase {
*/
public function test_wp_get_webp_info( $file, $expected ) {
$editor = wp_get_image_editor( $file );
if ( is_wp_error( $editor ) || ! $editor->supports_mime_type( 'image/webp' ) ) {
$this->markTestSkipped( sprintf( 'Skipping test: no WebP support in the editor engine %s on this system.', $this->editor_engine ) );
} else {
$file_data = wp_get_webp_info( $file );
$this->assertSame( $file_data, $expected );
$this->markTestSkipped( sprintf( 'No WebP support in the editor engine %s on this system.', $this->editor_engine ) );
}
$file_data = wp_get_webp_info( $file );
$this->assertSame( $file_data, $expected );
}
/**
* Data provider for test_wp_get_webp_info();
* Data provider for test_wp_get_webp_info().
*/
public function _test_wp_get_webp_info() {
return array(

3
tests/phpunit/tests/image/functions.php
View File

@ -99,7 +99,8 @@ class Tests_Image_Functions extends WP_UnitTestCase {
// Add WebP images if the image editor supports them.
$file = DIR_TESTDATA . '/images/test-image.webp';
$editor = wp_get_image_editor( $file );
if ( ( ! is_wp_error( $editor ) ) && $editor->supports_mime_type( 'image/webp' ) ) {
if ( ! is_wp_error( $editor ) && $editor->supports_mime_type( 'image/webp' ) ) {
$files = array_merge(
$files,
array(

18
tests/phpunit/tests/image/resize.php
View File

@ -70,16 +70,16 @@ abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase
// Check if the editor supports the webp mime type.
if ( is_wp_error( $editor ) || ! $editor->supports_mime_type( 'image/webp' ) ) {
$this->markTestSkipped( sprintf( 'Skipping test: no WebP support in the editor engine %s on this system.', $this->editor_engine ) );
} else {
$image = $this->resize_helper( $file, 25, 25 );
$this->assertSame( 'test-image-25x25.webp', wp_basename( $image ) );
list($w, $h, $type) = wp_getimagesize( $image );
$this->assertSame( 25, $w );
$this->assertSame( 25, $h );
$this->assertSame( IMAGETYPE_WEBP, $type );
unlink( $image );
$this->markTestSkipped( sprintf( 'No WebP support in the editor engine %s on this system.', $this->editor_engine ) );
}
$image = $this->resize_helper( $file, 25, 25 );
$this->assertSame( 'test-image-25x25.webp', wp_basename( $image ) );
list($w, $h, $type) = wp_getimagesize( $image );
$this->assertSame( 25, $w );
$this->assertSame( 25, $h );
$this->assertSame( IMAGETYPE_WEBP, $type );
unlink( $image );
}
function test_resize_larger() {