<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[50814] trunk: Media: Some documentation and test improvements for WebP support:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/50814">50814</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/50814","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-05-05 17:06:17 +0000 (Wed, 05 May 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Media: Some documentation and test improvements for WebP support:
* 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 <a href="https://core.trac.wordpress.org/changeset/50810">[50810]</a>.
See <a href="https://core.trac.wordpress.org/ticket/35725">#35725</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescompatphp">trunk/src/wp-includes/compat.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
<li><a href="#trunktestsphpunittestsimageeditorphp">trunk/tests/phpunit/tests/image/editor.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
<li><a href="#trunktestsphpunittestsimageresizephp">trunk/tests/phpunit/tests/image/resize.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/compat.php 2021-05-05 15:53:41 UTC (rev 50813)
+++ trunk/src/wp-includes/compat.php 2021-05-05 17:06:17 UTC (rev 50814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +371,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// WebP constants may not be defined, even in cases where the format is supported.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// WebP constants are only defined in PHP 7.1+.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'IMAGETYPE_WEBP' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'IMAGETYPE_WEBP', 18 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2021-05-05 15:53:41 UTC (rev 50813)
+++ trunk/src/wp-includes/functions.php 2021-05-05 17:06:17 UTC (rev 50814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3079,9 +3079,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * 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
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $magic = bin2hex( $magic );
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> // RIFF.
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2021-05-05 15:53:41 UTC (rev 50813)
+++ trunk/src/wp-includes/media.php 2021-05-05 17:06:17 UTC (rev 50814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5024,7 +5024,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param [type] $filename Path to a WebP file.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $filename Path to a WebP file.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array $webp_info {
</span><span class="cx" style="display: block; padding: 0 10px"> * An array of WebP image information.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5038,9 +5038,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $width = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $height = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $type = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! 'image/webp' === wp_get_image_mime( $filename ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return compact( 'width', 'height', 'type' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> $handle = fopen( $filename, 'rb' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $handle ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5083,6 +5085,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } catch ( Exception $e ) {
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return compact( 'width', 'height', 'type' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5097,6 +5100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_webp_is_lossy( $filename ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $webp_info = wp_get_webp_info( $filename );
</span><span class="cx" style="display: block; padding: 0 10px"> $type = $webp_info['type'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $type && 'lossy' === $type;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5113,17 +5117,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_get_image_size( $filename, &$imageinfo = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Try getimagesize() first.
</span><span class="cx" style="display: block; padding: 0 10px"> $info = getimagesize( $filename, $imageinfo );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $info ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $info;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // For PHP versions that don't support WebP images, extract the image
- // size info from the file headers.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // For PHP versions that don't support WebP images,
+ // extract the image size info from the file headers.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'image/webp' === wp_get_image_mime( $filename ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $webp_info = wp_get_webp_info( $filename );
</span><span class="cx" style="display: block; padding: 0 10px"> $width = $webp_info['width'];
</span><span class="cx" style="display: block; padding: 0 10px"> $height = $webp_info['height'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Mimic the native return format.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Mimic the native return format.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $width && $height ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> $width,
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions.php 2021-05-05 15:53:41 UTC (rev 50813)
+++ trunk/tests/phpunit/tests/functions.php 2021-05-05 17:06:17 UTC (rev 50814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1240,11 +1240,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // let's restrict comparison to expected keys only.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $expected ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $expected as $k => $v ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( true, isset( $result[ $k ] ) );
- $this->assertEquals( $expected[ $k ], $result[ $k ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertArrayHasKey( $k, $result );
+ $this->assertSame( $expected[ $k ], $result[ $k ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $expected, $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $expected, $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1312,7 +1312,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Data provider for test_wp_get_image_mime();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Data provider for test_wp_get_image_mime().
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function _wp_get_image_mime() {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1367,7 +1367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Data profider for test_wp_getimagesize();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Data profider for test_wp_getimagesize().
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function data_wp_getimagesize() {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span></span></pre></div>
<a id="trunktestsphpunittestsimageeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/editor.php 2021-05-05 15:53:41 UTC (rev 50813)
+++ trunk/tests/phpunit/tests/image/editor.php 2021-05-05 17:06:17 UTC (rev 50814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,16 +205,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_get_webp_info( $file, $expected ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = wp_get_image_editor( $file );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $editor ) || ! $editor->supports_mime_type( 'image/webp' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->markTestSkipped( sprintf( 'No WebP support in the editor engine %s on this system.', $this->editor_engine ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $file_data = wp_get_webp_info( $file );
+ $this->assertSame( $file_data, $expected );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Data provider for test_wp_get_webp_info();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Data provider for test_wp_get_webp_info().
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function _test_wp_get_webp_info() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span></span></pre></div>
<a id="trunktestsphpunittestsimagefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/functions.php 2021-05-05 15:53:41 UTC (rev 50813)
+++ trunk/tests/phpunit/tests/image/functions.php 2021-05-05 17:06:17 UTC (rev 50814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add WebP images if the image editor supports them.
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/test-image.webp';
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = wp_get_image_editor( $file );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( ! is_wp_error( $editor ) ) && $editor->supports_mime_type( 'image/webp' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! is_wp_error( $editor ) && $editor->supports_mime_type( 'image/webp' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $files = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> $files,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunktestsphpunittestsimageresizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/resize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/resize.php 2021-05-05 15:53:41 UTC (rev 50813)
+++ trunk/tests/phpunit/tests/image/resize.php 2021-05-05 17:06:17 UTC (rev 50814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,16 +70,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if the editor supports the webp mime type.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $editor ) || ! $editor->supports_mime_type( 'image/webp' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->markTestSkipped( sprintf( 'No WebP support in the editor engine %s on this system.', $this->editor_engine ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_resize_larger() {
</span></span></pre>
</div>
</div>
</body>
</html>