<!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>[51415] trunk/tests/phpunit/tests: Tests: Clean up skipping conditions and requirements for various tests.</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/51415">51415</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/51415","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-07-13 10:43:42 +0000 (Tue, 13 Jul 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'>Tests: Clean up skipping conditions and requirements for various tests.
This improves the consistency of test skipping and ensures that:
* The `@requires` annotations use the right condition and format, and are on the right level (class vs. function).
* Inline conditions with a `markTestSkipped()` call are only used when annotations cannot be used.
* All `markTestSkipped()` calls contain a verbose explanation of why the test is being skipped.
Props jrf, hellofromTonya.
Fixes <a href="https://core.trac.wordpress.org/ticket/53009">#53009</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsajaxMediaEditphp">trunk/tests/phpunit/tests/ajax/MediaEdit.php</a></li>
<li><a href="#trunktestsphpunittestscachephp">trunk/tests/phpunit/tests/cache.php</a></li>
<li><a href="#trunktestsphpunittestscompatphp">trunk/tests/phpunit/tests/compat.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsphpunittestsdbcharsetphp">trunk/tests/phpunit/tests/db/charset.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsanonymizationphp">trunk/tests/phpunit/tests/functions/anonymization.php</a></li>
<li><a href="#trunktestsphpunittestsgeneraltemplatephp">trunk/tests/phpunit/tests/general/template.php</a></li>
<li><a href="#trunktestsphpunittestshttpbasephp">trunk/tests/phpunit/tests/http/base.php</a></li>
<li><a href="#trunktestsphpunittestshttpfunctionsphp">trunk/tests/phpunit/tests/http/functions.php</a></li>
<li><a href="#trunktestsphpunittestsimageeditorGdphp">trunk/tests/phpunit/tests/image/editorGd.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
<li><a href="#trunktestsphpunittestsimageintermediateSizephp">trunk/tests/phpunit/tests/image/intermediateSize.php</a></li>
<li><a href="#trunktestsphpunittestsimageresizeGdphp">trunk/tests/phpunit/tests/image/resizeGd.php</a></li>
<li><a href="#trunktestsphpunittestsl10ngetLocalephp">trunk/tests/phpunit/tests/l10n/getLocale.php</a></li>
<li><a href="#trunktestsphpunittestsl10ngetUserLocalephp">trunk/tests/phpunit/tests/l10n/getUserLocale.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
<li><a href="#trunktestsphpunittestspomomophp">trunk/tests/phpunit/tests/pomo/mo.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestattachmentscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php</a></li>
<li><a href="#trunktestsphpunittestsurlphp">trunk/tests/phpunit/tests/url.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsmediagallerywidgetphp">trunk/tests/phpunit/tests/widgets/media-gallery-widget.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsmediawidgetphp">trunk/tests/phpunit/tests/widgets/media-widget.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcmweditPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcmwgetPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcmwgetRecentPostsphp">trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcmwnewPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpeditPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetMediaItemphp">trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpnewPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpuploadFilephp">trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsajaxMediaEditphp"></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/ajax/MediaEdit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/MediaEdit.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/ajax/MediaEdit.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage UnitTests
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ajax
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Ajax_MediaEdit extends WP_Ajax_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +27,6 @@
</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"> * @ticket 22985
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @requires function imagejpeg
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function testCropImageThumbnail() {
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/image-edit.php';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +56,6 @@
</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"> * @ticket 32171
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @requires function imagejpeg
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function testImageEditOverwriteConstant() {
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'IMAGE_EDIT_OVERWRITE', true );
</span></span></pre></div>
<a id="trunktestsphpunittestscachephp"></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/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/cache.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/cache.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,7 +251,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_switch_to_blog() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! method_exists( $this->cache, 'switch_to_blog' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->markTestSkipped( 'This test requires a switch_to_blog() method on the cache object.' );
</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"> $key = __FUNCTION__;
</span></span></pre></div>
<a id="trunktestsphpunittestscompatphp"></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/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/compat.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/compat.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,12 +242,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test is_countable() polyfill for ResourceBundle.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43583
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @requires extension intl
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_countable_ResourceBundle() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! class_exists( 'ResourceBundle' ) ) {
- $this->markTestSkipped( 'The intl extension is not loaded. ResourceBundle not tested for is_countable().' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_countable( new ResourceBundle( 'en', null ) ) );
</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">@@ -255,12 +253,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test is_countable() polyfill for SimpleXMLElement.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43583
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @requires extension simplexml
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_countable_SimpleXMLElement() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! class_exists( 'SimpleXMLElement' ) ) {
- $this->markTestSkipped( 'The xml extension is not loaded. SimpleXMLElement not tested for is_countable().' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_countable( new SimpleXMLElement( '<xml><tag>1</tag><tag>2</tag></xml>' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></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/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/customize/manager.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -541,6 +541,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::import_theme_starter_content
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::_save_starter_content_changeset
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_import_theme_starter_content() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$admin_user_id );
</span></span></pre></div>
<a id="trunktestsphpunittestsdbcharsetphp"></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/db/charset.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db/charset.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/db/charset.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -762,7 +762,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><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"> self::$_wpdb->query( $create );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -804,7 +803,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><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"> self::$_wpdb->query( $create );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -828,7 +826,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><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"> self::$_wpdb->is_mysql = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -856,7 +853,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><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"> unset( self::$_wpdb->is_mysql );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -917,7 +913,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><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"> self::$_wpdb->query( $create );
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsanonymizationphp"></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/anonymization.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/anonymization.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/functions/anonymization.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,8 +25,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 41083
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43545
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @requires function inet_ntop
- * @requires function inet_pton
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $raw_ip Raw IP address.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $expected_result Expected result.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,26 +88,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '1000:0000:0000:0000:0000:0000:0000:0001or=\"',
</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">- // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
- array(
- 'or=\"[1000:0000:0000:0000:0000:0000:0000:0001]:400',
- '1000::',
- ),
- // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
- array(
- 'or=\"[1000:0000:0000:0000:0000:0000:0000:0001]',
- '1000::',
- ),
- // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
- array(
- 'or=\"[1000:0000:0000:0000:0000:0000:0000:0001]400',
- '1000::',
- ),
- // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
- array(
- '[1000:0000:0000:0000:0000:0000:0000:0001]:235\"or=',
- '1000::',
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> // IPv4, no port.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '10.20.30.45',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,36 +103,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '10.20.30.45/24',
</span><span class="cx" style="display: block; padding: 0 10px"> '10.20.30.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">- // IPv6, no port.
- array(
- '2a03:2880:2110:df07:face:b00c::1',
- '2a03:2880:2110:df07::',
- ),
- // IPv6, port.
- array(
- '[2a03:2880:2110:df07:face:b00c::1]:20000',
- '2a03:2880:2110:df07::',
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> // IPv6, no port, reducible representation.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '0000:0000:0000:0000:0000:0000:0000:0001',
</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">- // IPv6, no port, partially reducible representation.
- array(
- '1000:0000:0000:0000:0000:0000:0000:0001',
- '1000::',
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> // IPv6, port, reducible representation.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '[0000:0000:0000:0000:0000:0000:0000:0001]:1234',
</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">- // IPv6, port, partially reducible representation.
- array(
- '[1000:0000:0000:0000:0000:0000:0000:0001]:5678',
- '1000::',
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> // IPv6, no port, reduced representation.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '::',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,6 +153,80 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '[::127.0.0.1]:30000',
</span><span class="cx" style="display: block; padding: 0 10px"> '::ffff:127.0.0.0',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ );
+ }
+
+ /**
+ * Test that wp_privacy_anonymize_ip() properly anonymizes all possible IP address formats.
+ *
+ * @dataProvider data_wp_privacy_anonymize_ip_with_inet_dependency
+ *
+ * @ticket 41083
+ * @ticket 43545
+ * @requires function inet_ntop
+ * @requires function inet_pton
+ *
+ * @param string $raw_ip Raw IP address.
+ * @param string $expected_result Expected result.
+ */
+ public function test_wp_privacy_anonymize_ip_with_inet_dependency( $raw_ip, $expected_result ) {
+ $this->test_wp_privacy_anonymize_ip( $raw_ip, $expected_result );
+ }
+
+ /**
+ * Provide test cases for `test_wp_privacy_anonymize_ip()`.
+ *
+ * @since 4.9.6 Moved from `Test_WP_Community_Events::data_get_unsafe_client_ip_anonymization()`.
+ *
+ * @return array {
+ * @type array {
+ * @string string $raw_ip Raw IP address.
+ * @string string $expected_result Expected result.
+ * }
+ * }
+ */
+ public function data_wp_privacy_anonymize_ip_with_inet_dependency() {
+ return array(
+ // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
+ array(
+ 'or=\"[1000:0000:0000:0000:0000:0000:0000:0001]:400',
+ '1000::',
+ ),
+ // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
+ array(
+ 'or=\"[1000:0000:0000:0000:0000:0000:0000:0001]',
+ '1000::',
+ ),
+ // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
+ array(
+ 'or=\"[1000:0000:0000:0000:0000:0000:0000:0001]400',
+ '1000::',
+ ),
+ // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
+ array(
+ '[1000:0000:0000:0000:0000:0000:0000:0001]:235\"or=',
+ '1000::',
+ ),
+ // IPv6, no port.
+ array(
+ '2a03:2880:2110:df07:face:b00c::1',
+ '2a03:2880:2110:df07::',
+ ),
+ // IPv6, port.
+ array(
+ '[2a03:2880:2110:df07:face:b00c::1]:20000',
+ '2a03:2880:2110:df07::',
+ ),
+ // IPv6, no port, partially reducible representation.
+ array(
+ '1000:0000:0000:0000:0000:0000:0000:0001',
+ '1000::',
+ ),
+ // IPv6, port, partially reducible representation.
+ array(
+ '[1000:0000:0000:0000:0000:0000:0000:0001]:5678',
+ '1000::',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> // IPv6 with reachability scope.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fe80::b059:65f4:e877:c40%16',
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneraltemplatephp"></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/general/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/template.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/general/template.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,6 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_site_icon_url
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_site_icon_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( get_site_icon_url() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,6 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::site_icon_url
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_site_icon_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,6 +64,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::has_site_icon
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_has_site_icon() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_site_icon() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,6 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_site_icon
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_site_icon() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,6 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_site_icon
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_site_icon_with_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '' );
</span></span></pre></div>
<a id="trunktestsphpunittestshttpbasephp"></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/http/base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/base.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/http/base.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,11 +20,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_callable( array( 'WP_Http', '_getTransport' ) ) ) {
- $this->markTestSkipped( 'The WP_Http tests require a class-http.php file of r17550 or later.' );
- return;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $class = 'WP_Http_' . ucfirst( $this->transport );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! call_user_func( array( $class, 'test' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( sprintf( 'The transport %s is not supported on this system.', $this->transport ) );
</span></span></pre></div>
<a id="trunktestsphpunittestshttpfunctionsphp"></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/http/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/functions.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/http/functions.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group http
</span><span class="cx" style="display: block; padding: 0 10px"> * @group external-http
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @requires extension openssl
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_HTTP_Functions extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsimageeditorGdphp"></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/editorGd.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/editorGd.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/image/editorGd.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,6 +53,8 @@
</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"> * Test resizing an image, not using crop
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_resize() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/waffles.jpg';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,6 +75,8 @@
</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"> * Test multi_resize with single image resize and no crop
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_multi_resize() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/waffles.jpg';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,6 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test multi_resize with multiple sizes
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26823
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_multi_resize() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/waffles.jpg';
</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-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/image/functions.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,19 +172,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires extension fileinfo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_save_image_file() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $classes = $this->get_image_editor_engine_classes();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $classes as $key => $class ) {
- if ( ! call_user_func( array( $class, 'test' ) ) ) {
- // If the image editor isn't available, skip it.
- unset( $classes[ $key ] );
- }
- }
-
- if ( ! $classes ) {
- $this->markTestSkipped( sprintf( 'The image editor engine %s is not supported on this system.', 'WP_Image_Editor_GD' ) );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/image-edit.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Mime types.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,19 +222,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires extension fileinfo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_mime_overrides_filename() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $classes = $this->get_image_editor_engine_classes();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $classes as $key => $class ) {
- if ( ! call_user_func( array( $class, 'test' ) ) ) {
- // If the image editor isn't available, skip it.
- unset( $classes[ $key ] );
- }
- }
-
- if ( ! $classes ) {
- $this->markTestSkipped( sprintf( 'The image editor engine %s is not supported on this system.', 'WP_Image_Editor_GD' ) );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Test each image editor engine.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $classes as $class ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $img = new $class( DIR_TESTDATA . '/images/canola.jpg' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,19 +253,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires extension fileinfo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_inferred_mime_types() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $classes = $this->get_image_editor_engine_classes();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $classes as $key => $class ) {
- if ( ! call_user_func( array( $class, 'test' ) ) ) {
- // If the image editor isn't available, skip it.
- unset( $classes[ $key ] );
- }
- }
-
- if ( ! $classes ) {
- $this->markTestSkipped( sprintf( 'The image editor engine %s is not supported on this system.', 'WP_Image_Editor_GD' ) );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Mime types.
</span><span class="cx" style="display: block; padding: 0 10px"> $mime_types = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'jpg' => 'image/jpeg',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,6 +309,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $editor2 = wp_get_image_editor( DIR_TESTDATA );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $editor2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $classes = $this->get_image_editor_engine_classes();
+
+ // Then, test with editors.
+ foreach ( $classes as $class ) {
+ $editor = new $class( DIR_TESTDATA );
+ $loaded = $editor->load();
+
+ $this->assertInstanceOf( 'WP_Error', $loaded );
+ $this->assertSame( 'error_loading_image', $loaded->get_error_code() );
+ }
+ }
+
+ /**
+ * Get the available image editor engine class(es).
+ *
+ * @return string[] Available image editor classes; empty array when none are avaialble.
+ */
+ private function get_image_editor_engine_classes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $classes as $key => $class ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,18 +336,11 @@
</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">- if ( ! $classes ) {
- $this->markTestSkipped( sprintf( 'The image editor engine %s is not supported on this system.', 'WP_Image_Editor_GD' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $classes ) ) {
+ $this->markTestSkipped( 'Image editor engines WP_Image_Editor_GD and WP_Image_Editor_Imagick are not supported on this system.' );
</ins><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">- // Then, test with editors.
- foreach ( $classes as $class ) {
- $editor = new $class( DIR_TESTDATA );
- $loaded = $editor->load();
-
- $this->assertInstanceOf( 'WP_Error', $loaded );
- $this->assertSame( 'error_loading_image', $loaded->get_error_code() );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $classes;
</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></pre></div>
<a id="trunktestsphpunittestsimageintermediateSizephp"></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/intermediateSize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/intermediateSize.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/image/intermediateSize.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,6 +156,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"> * @ticket 17626
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_intermediate_sizes_by_array_nearest_false() {
</span><span class="cx" style="display: block; padding: 0 10px"> // If an exact size is not found, it should be returned.
</span></span></pre></div>
<a id="trunktestsphpunittestsimageresizeGdphp"></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/resizeGd.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/resizeGd.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/image/resizeGd.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,6 +5,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group media
</span><span class="cx" style="display: block; padding: 0 10px"> * @group upload
</span><span class="cx" style="display: block; padding: 0 10px"> * @group resize
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once __DIR__ . '/resize.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsl10ngetLocalephp"></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/l10n/getLocale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/getLocale.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/l10n/getLocale.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_network_option_should_be_fallback_on_multisite() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->markTestSkipped( __METHOD__ . ' requires Multisite.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->markTestSkipped( 'This test requires Multisite.' );
</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"> global $locale;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_option_should_be_respected_on_nonmultisite() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->markTestSkipped( __METHOD__ . ' does not apply to Multisite.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->markTestSkipped( 'This test does not apply to Multisite.' );
</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"> global $locale;
</span></span></pre></div>
<a id="trunktestsphpunittestsl10ngetUserLocalephp"></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/l10n/getUserLocale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/getUserLocale.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/l10n/getUserLocale.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_user_locale_is_same_across_network() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->markTestSkipped( __METHOD__ . ' requires Multisite.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->markTestSkipped( 'This test requires Multisite.' );
</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"> $user_locale = get_user_locale();
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/media.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1722,6 +1722,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"> * @ticket 33641
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_calculate_image_srcset_no_width() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = get_attached_file( self::$large_id );
</span></span></pre></div>
<a id="trunktestsphpunittestspomomophp"></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/pomo/mo.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pomo/mo.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/pomo/mo.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_overloaded_mb_functions() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( ini_get( 'mbstring.func_overload' ) & 2 ) === 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->markTestSkipped( __METHOD__ . ' only runs when mbstring.func_overload is enabled.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->markTestSkipped( 'This test requires mbstring.func_overload to be enabled.' );
</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"> $mo = new MO();
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestattachmentscontrollerphp"></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/rest-api/rest-attachments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -743,6 +743,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertErrorResponse( 'rest_forbidden', $response, 401 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_create_item() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -792,6 +795,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'codeispoetry', $data['title']['raw'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_create_item_with_files() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'POST', '/wp/v2/media' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -810,6 +816,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 201, $response->get_status() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_create_item_with_upload_files_role() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$uploader_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'POST', '/wp/v2/media' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -924,6 +933,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_create_item_alt_text() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'POST', '/wp/v2/media' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,6 +949,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'test alt text', $attachment['alt_text'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_create_item_unsafe_alt_text() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'POST', '/wp/v2/media' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -951,6 +966,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"> * @ticket 40861
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_create_item_ensure_relative_path() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1274,6 +1290,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"> * @dataProvider attachment_roundtrip_provider
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_roundtrip_as_author( $raw, $expected ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$author_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1281,6 +1298,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->verify_attachment_roundtrip( $raw, $expected );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_attachment_roundtrip_as_editor_unfiltered_html() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1332,6 +1352,9 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_attachment_roundtrip_as_superadmin_unfiltered_html() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$superadmin_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_user_can( 'unfiltered_html' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1808,6 +1831,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * once when attachments are created.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45269
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_rest_insert_attachment_hooks_fire_once_on_create() {
</span><span class="cx" style="display: block; padding: 0 10px"> self::$rest_insert_attachment_count = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1865,6 +1889,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"> * @ticket 44567
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_create_item_with_meta_values() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_meta(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1902,6 +1927,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"> * @ticket 44405
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_edit_image_returns_error_if_logged_out() {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment = self::factory()->attachment->create_upload_object( $this->test_file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1914,6 +1940,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"> * @ticket 44405
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_edit_image_returns_error_if_cannot_upload() {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = self::factory()->user->create_and_get( array( 'role' => 'editor' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1930,6 +1957,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"> * @ticket 44405
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_edit_image_returns_error_if_cannot_edit() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$uploader_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1956,6 +1984,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"> * @ticket 44405
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_edit_image_returns_error_if_unsupported_mime_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$superadmin_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1975,6 +2004,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"> * @ticket 44405
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_edit_image_returns_error_if_no_edits() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$superadmin_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1988,6 +2018,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"> * @ticket 44405
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_edit_image_rotate() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$superadmin_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2012,6 +2043,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"> * @ticket 44405
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_edit_image_crop() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$superadmin_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2118,6 +2150,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"> * @ticket 50565
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_edit_image_returns_error_if_mismatched_src() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$superadmin_id );
</span></span></pre></div>
<a id="trunktestsphpunittestsurlphp"></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/url.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/url.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/url.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,10 +273,6 @@
</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"> function test_set_url_scheme() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'set_url_scheme' ) ) {
- return;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $links = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'http://wordpress.org/',
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://wordpress.org/',
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsmediagallerywidgetphp"></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/widgets/media-gallery-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/media-gallery-widget.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/widgets/media-gallery-widget.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test update() method.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media_Gallery::render_media
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_render_media() {
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Gallery();
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsmediawidgetphp"></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/widgets/media-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/media-widget.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/widgets/media-widget.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,11 +95,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $id_base, $widget->id_base );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $name, $widget->name );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Method assertArraySubset doesn't exist in phpunit versions compatible with PHP 5.2.
- if ( method_exists( $this, 'assertArraySubset' ) ) {
- $this->assertArraySubset( $widget_options, $widget->widget_options );
- $this->assertArraySubset( $control_options, $widget->control_options );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertArraySubset( $widget_options, $widget->widget_options );
+ $this->assertArraySubset( $control_options, $widget->control_options );
</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">@@ -135,6 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test is_attachment_with_mime_type method.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Widget_Media::is_attachment_with_mime_type
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_attachment_with_mime_type() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmweditPostphp"></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/xmlrpc/mw/editPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,6 +132,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $editor_id, $out->post_author );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_post_thumbnail() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmwgetPostphp"></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/xmlrpc/mw/getPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,6 +89,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_post_thumbnail() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmwgetRecentPostsphp"></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/xmlrpc/mw/getRecentPosts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,6 +94,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_post_thumbnail() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmwnewPostphp"></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/xmlrpc/mw/newPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,6 +128,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Test', $out->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_post_thumbnail() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpeditPostphp"></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/xmlrpc/wp/editPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,6 +132,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $editor_id, $out->post_author );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_post_thumbnail() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetMediaItemphp"></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/xmlrpc/wp/getMediaItem.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,6 +2,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"> * @group xmlrpc
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_getMediaItem extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $post_id;
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpnewPostphp"></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/xmlrpc/wp/newPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,6 +145,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Test', $out->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_post_thumbnail() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpuploadFilephp"></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/xmlrpc/wp/uploadFile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php 2021-07-13 05:57:04 UTC (rev 51414)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php 2021-07-13 10:43:42 UTC (rev 51415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,6 +2,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"> * @group xmlrpc
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_uploadFile extends WP_XMLRPC_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>