<!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>[45588] trunk/tests/phpunit: Coding Standards: Fix the `Squiz.PHP.DisallowMultipleAssignments` violations in `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/45588">45588</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/45588","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-07-02 04:43:01 +0000 (Tue, 02 Jul 2019)</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'>Coding Standards: Fix the `Squiz.PHP.DisallowMultipleAssignments` violations in `tests`.
See <a href="https://core.trac.wordpress.org/ticket/47632">#47632</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesabstracttestcasephp">trunk/tests/phpunit/includes/abstract-testcase.php</a></li>
<li><a href="#trunktestsphpunitincludesbootstrapphp">trunk/tests/phpunit/includes/bootstrap.php</a></li>
<li><a href="#trunktestsphpunitincludesinstallphp">trunk/tests/phpunit/includes/install.php</a></li>
<li><a href="#trunktestsphpunitincludesphpunit7speedtraplistenerphp">trunk/tests/phpunit/includes/phpunit7/speed-trap-listener.php</a></li>
<li><a href="#trunktestsphpunitincludestestcasecanonicalphp">trunk/tests/phpunit/includes/testcase-canonical.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPluginphp">trunk/tests/phpunit/tests/admin/includesPlugin.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPostphp">trunk/tests/phpunit/tests/admin/includesPost.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesScreenphp">trunk/tests/phpunit/tests/admin/includesScreen.php</a></li>
<li><a href="#trunktestsphpunittestsadminbarphp">trunk/tests/phpunit/tests/adminbar.php</a></li>
<li><a href="#trunktestsphpunittestsajaxAutosavephp">trunk/tests/phpunit/tests/ajax/Autosave.php</a></li>
<li><a href="#trunktestsphpunittestsajaxCustomizeManagerphp">trunk/tests/phpunit/tests/ajax/CustomizeManager.php</a></li>
<li><a href="#trunktestsphpunittestscommentgetCommentAuthorUrlLinkphp">trunk/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php</a></li>
<li><a href="#trunktestsphpunittestscommentgetPageOfCommentphp">trunk/tests/phpunit/tests/comment/getPageOfComment.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsphpunittestscustomizesectionphp">trunk/tests/phpunit/tests/customize/section.php</a></li>
<li><a href="#trunktestsphpunittestsdbcharsetphp">trunk/tests/phpunit/tests/db/charset.php</a></li>
<li><a href="#trunktestsphpunittestsformattingAutopphp">trunk/tests/phpunit/tests/formatting/Autop.php</a></li>
<li><a href="#trunktestsphpunittestsformattingSanitizeTextFieldphp">trunk/tests/phpunit/tests/formatting/SanitizeTextField.php</a></li>
<li><a href="#trunktestsphpunittestsformattingdatephp">trunk/tests/phpunit/tests/formatting/date.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
<li><a href="#trunktestsphpunittestsgeneralarchivesphp">trunk/tests/phpunit/tests/general/archives.php</a></li>
<li><a href="#trunktestsphpunittestsimportbasephp">trunk/tests/phpunit/tests/import/base.php</a></li>
<li><a href="#trunktestsphpunittestsksesphp">trunk/tests/phpunit/tests/kses.php</a></li>
<li><a href="#trunktestsphpunittestsmenunavmenuphp">trunk/tests/phpunit/tests/menu/nav-menu.php</a></li>
<li><a href="#trunktestsphpunittestsoptionwpLoadAllOptionsphp">trunk/tests/phpunit/tests/option/wpLoadAllOptions.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPagesphp">trunk/tests/phpunit/tests/post/getPages.php</a></li>
<li><a href="#trunktestsphpunittestspostwpUniquePostSlugphp">trunk/tests/phpunit/tests/post/wpUniquePostSlug.php</a></li>
<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>
<li><a href="#trunktestsphpunittestsqueryconditionalsphp">trunk/tests/phpunit/tests/query/conditionals.php</a></li>
<li><a href="#trunktestsphpunittestsqueryresultsphp">trunk/tests/phpunit/tests/query/results.php</a></li>
<li><a href="#trunktestsphpunittestsquerysetupPostdataphp">trunk/tests/phpunit/tests/query/setupPostdata.php</a></li>
<li><a href="#trunktestsphpunittestsquerytaxQueryphp">trunk/tests/phpunit/tests/query/taxQuery.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpostscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php</a></li>
<li><a href="#trunktestsphpunittestsuserslashesphp">trunk/tests/phpunit/tests/user/slashes.php</a></li>
<li><a href="#trunktestsphpunittestsuserwpSetCurrentUserphp">trunk/tests/phpunit/tests/user/wpSetCurrentUser.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesabstracttestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/abstract-testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/abstract-testcase.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/includes/abstract-testcase.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -706,7 +706,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // note: the WP and WP_Query classes like to silently fetch parameters
</span><span class="cx" style="display: block; padding: 0 10px"> // from all over the place (globals, GET, etc), which makes it tricky
</span><span class="cx" style="display: block; padding: 0 10px"> // to run them more than once without very carefully clearing everything
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_GET = $_POST = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_GET = array();
+ $_POST = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'query_string', 'id', 'postdata', 'authordata', 'day', 'currentmonth', 'page', 'pages', 'multipage', 'more', 'numpages', 'pagenow', 'current_screen' ) as $v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $GLOBALS[ $v ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS[ $v ] );
</span></span></pre></div>
<a id="trunktestsphpunitincludesbootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/bootstrap.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/includes/bootstrap.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'REST_TESTS_IMPOSSIBLY_HIGH_NUMBER', 99999999 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$PHP_SELF = '/index.php';
+$GLOBALS['PHP_SELF'] = '/index.php';
+$_SERVER['PHP_SELF'] = '/index.php';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Should we run in multisite mode?
</span><span class="cx" style="display: block; padding: 0 10px"> $multisite = '1' == getenv( 'WP_MULTISITE' );
</span></span></pre></div>
<a id="trunktestsphpunitincludesinstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/install.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/includes/install.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> tests_reset__SERVER();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$PHP_SELF = '/index.php';
+$GLOBALS['PHP_SELF'] = '/index.php';
+$_SERVER['PHP_SELF'] = '/index.php';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> tests_add_filter( 'wp_die_handler', '_wp_die_handler_filter_exit' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitincludesphpunit7speedtraplistenerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/phpunit7/speed-trap-listener.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/phpunit7/speed-trap-listener.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/includes/phpunit7/speed-trap-listener.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,7 +266,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Renders slow test report footer.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function renderFooter() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $hidden = $this->getHiddenCount( $this->slow ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hidden = $this->getHiddenCount( $this->slow );
+ if ( $hidden ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo sprintf( '...and there %s %s more above your threshold hidden from view', $hidden == 1 ? 'is' : 'are', $hidden );
</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="trunktestsphpunitincludestestcasecanonicalphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/testcase-canonical.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase-canonical.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/includes/testcase-canonical.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,13 +61,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-06-02 00:00:00',
</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">- self::$post_ids[] = $post_id = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'post-format-test-gallery',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-06-10 00:00:00',
</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">- self::$post_ids[] = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_ids[] = $post_id;
+ $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'import_id' => 611,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'attachment',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,6 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $post_id,
</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">+ self::$post_ids[] = $post_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_ids[] = $factory->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +86,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">- self::$post_ids[] = $post_id = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'import_id' => 149,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'comment-test',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,6 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2008-03-03 00:00:00',
</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">+ self::$post_ids[] = $post_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$comment_ids = $factory->comment->create_post_comments( $post_id, 15 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_ids[] = $factory->post->create( array( 'post_date' => '2008-09-05 00:00:00' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,12 +114,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'about',
</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">- self::$post_ids[] = $post_id = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'parent-page',
</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">+ self::$post_ids[] = $post_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$post_ids[] = $factory->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'import_id' => 144,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,13 +130,14 @@
</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">- self::$post_ids[] = $parent_id = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_id = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'parent',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</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">- self::$post_ids[] = $child_id_1 = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_ids[] = $parent_id;
+ $child_id_1 = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'child1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +144,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $parent_id,
</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">- self::$post_ids[] = $child_id_2 = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_ids[] = $child_id_1;
+ $child_id_2 = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'child2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +152,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $parent_id,
</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">- self::$post_ids[] = $grandchild_id_1 = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_ids[] = $child_id_2;
+ $grandchild_id_1 = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'grandchild',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +160,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $child_id_1,
</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">- self::$post_ids[] = $grandchild_id_2 = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_ids[] = $grandchild_id_1;
+ $grandchild_id_2 = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'grandchild',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,6 +168,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $child_id_2,
</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">+ self::$post_ids[] = $grandchild_id_2;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cat1 = $factory->term->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesPluginphp"></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/admin/includesPlugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPlugin.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/admin/includesPlugin.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,7 +406,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"> $files_to_move = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $mu_plugins = opendir( WPMU_PLUGIN_DIR ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mu_plugins = opendir( WPMU_PLUGIN_DIR );
+ if ( $mu_plugins ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> while ( false !== $plugin = readdir( $mu_plugins ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 !== strpos( $plugin, '.' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $files_to_move[] = $plugin;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,7 +433,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private function _restore_mu_plugins() {
</span><span class="cx" style="display: block; padding: 0 10px"> $mu_bu_dir = WP_CONTENT_DIR . '/mu-plugin-backup';
</span><span class="cx" style="display: block; padding: 0 10px"> $files_to_move = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_dir( $mu_bu_dir ) && $mu_plugins = opendir( $mu_bu_dir ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mu_plugins = @opendir( $mu_bu_dir );
+ if ( $mu_plugins ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> while ( false !== $plugin = readdir( $mu_plugins ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 !== strpos( $plugin, '.' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $files_to_move[] = $plugin;
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesPostphp"></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/admin/includesPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPost.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/admin/includesPost.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,11 +13,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $user_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$user_ids = self::$author_ids = $factory->user->create_many( 2, array( 'role' => 'author' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$user_ids = $factory->user->create_many( 2, array( 'role' => 'author' ) );
+ self::$author_ids = self::$user_ids;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$user_ids[] = self::$contributor_id = $factory->user->create( array( 'role' => 'contributor' ) );
- self::$user_ids[] = self::$editor_id = $factory->user->create( array( 'role' => 'editor' ) );
- self::$user_ids[] = self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$contributor_id = $factory->user->create( array( 'role' => 'contributor' ) );
+ self::$user_ids[] = self::$contributor_id;
+ self::$editor_id = $factory->user->create( array( 'role' => 'editor' ) );
+ self::$user_ids[] = self::$editor_id;
+ self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
+ self::$user_ids[] = self::$admin_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_id = $factory->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesScreenphp"></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/admin/includesScreen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesScreen.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/admin/includesScreen.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,20 +171,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $current_screen;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->core_screens as $hook_name => $screen ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_GET = $_POST = $_REQUEST = array();
- $GLOBALS['taxnow'] = $GLOBALS['typenow'] = '';
- $screen = (object) $screen;
- $hook = parse_url( $hook_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_GET = array();
+ $_POST = array();
+ $_REQUEST = array();
+ $GLOBALS['taxnow'] = '';
+ $GLOBALS['typenow'] = '';
+ $screen = (object) $screen;
+ $hook = parse_url( $hook_name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $hook['query'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $hook['query'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['taxonomy'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['taxnow'] = $_GET['taxonomy'] = $_POST['taxonomy'] = $_REQUEST['taxonomy'] = $args['taxonomy'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['taxnow'] = $args['taxonomy'];
+ $_GET['taxonomy'] = $args['taxonomy'];
+ $_POST['taxonomy'] = $args['taxonomy'];
+ $_REQUEST['taxonomy'] = $args['taxonomy'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['post_type'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['typenow'] = $_GET['post_type'] = $_POST['post_type'] = $_REQUEST['post_type'] = $args['post_type'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['typenow'] = $args['post_type'];
+ $_GET['post_type'] = $args['post_type'];
+ $_POST['post_type'] = $args['post_type'];
+ $_REQUEST['post_type'] = $args['post_type'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $screen->post_type ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['typenow'] = $_GET['post_type'] = $_POST['post_type'] = $_REQUEST['post_type'] = $screen->post_type;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['typenow'] = $screen->post_type;
+ $_GET['post_type'] = $screen->post_type;
+ $_POST['post_type'] = $screen->post_type;
+ $_REQUEST['post_type'] = $screen->post_type;
</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">@@ -484,7 +496,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function setup_block_editor_test( $hook = 'post.php' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'type_shows_in_rest', array( 'show_in_rest' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['typenow'] = $_GET['post_type'] = $_POST['post_type'] = $_REQUEST['post_type'] = 'type_shows_in_rest';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['typenow'] = 'type_shows_in_rest';
+ $_GET['post_type'] = 'type_shows_in_rest';
+ $_POST['post_type'] = 'type_shows_in_rest';
+ $_REQUEST['post_type'] = 'type_shows_in_rest';
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['hook_suffix'] = $hook;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'post.php' === $hook ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsadminbarphp"></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/adminbar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/adminbar.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/adminbar.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,9 +21,12 @@
</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"> public static function wpSetUpBeforeClass( $factory ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$user_ids[] = self::$editor_id = $factory->user->create( array( 'role' => 'editor' ) );
- self::$user_ids[] = self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
- self::$user_ids[] = self::$no_role_id = $factory->user->create( array( 'role' => '' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$editor_id = $factory->user->create( array( 'role' => 'editor' ) );
+ self::$user_ids[] = self::$editor_id;
+ self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
+ self::$user_ids[] = self::$admin_id;
+ self::$no_role_id = $factory->user->create( array( 'role' => '' ) );
+ self::$user_ids[] = self::$no_role_id;
</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="trunktestsphpunittestsajaxAutosavephp"></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/Autosave.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/Autosave.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/ajax/Autosave.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,8 +29,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $user_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$user_ids[] = self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
- self::$user_ids[] = self::$editor_id = $factory->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
+ self::$user_ids[] = self::$admin_id;
+ self::$editor_id = $factory->user->create( array( 'role' => 'editor' ) );
+ self::$user_ids[] = self::$editor_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_id = $factory->post->create( array( 'post_status' => 'draft' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post = get_post( self::$post_id );
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxCustomizeManagerphp"></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/CustomizeManager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/CustomizeManager.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/ajax/CustomizeManager.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,9 +119,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Unauthorized.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$subscriber_user_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nonce = wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() );
- $_POST['nonce'] = $_GET['nonce'] = $_REQUEST['nonce'] = $nonce;
- $exception = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nonce = wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() );
+ $_POST['nonce'] = $nonce;
+ $_GET['nonce'] = $nonce;
+ $_REQUEST['nonce'] = $nonce;
+ $exception = null;
</ins><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->setup_theme();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,14 +135,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Not called setup_theme.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$admin_user_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nonce = wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() );
- $_POST['nonce'] = $_GET['nonce'] = $_REQUEST['nonce'] = $nonce;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nonce = wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() );
+ $_POST['nonce'] = $nonce;
+ $_GET['nonce'] = $nonce;
+ $_REQUEST['nonce'] = $nonce;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_ajax_call( 'customize_save' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->_last_response_parsed['success'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'not_preview', $this->_last_response_parsed['data'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bad nonce.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST['nonce'] = $_GET['nonce'] = $_REQUEST['nonce'] = 'bad';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST['nonce'] = 'bad';
+ $_GET['nonce'] = 'bad';
+ $_REQUEST['nonce'] = 'bad';
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->setup_theme();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_ajax_call( 'customize_save' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->_last_response_parsed['success'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +154,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // User cannot create.
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST['nonce'] = $_GET['nonce'] = $_REQUEST['nonce'] = $nonce;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST['nonce'] = $nonce;
+ $_GET['nonce'] = $nonce;
+ $_REQUEST['nonce'] = $nonce;
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_obj = get_post_type_object( 'customize_changeset' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_obj->cap->create_posts = 'create_customize_changesets';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_ajax_call( 'customize_save' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,8 +258,10 @@
</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"> $wp_customize->register_controls();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nonce = wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() );
- $_POST['nonce'] = $_GET['nonce'] = $_REQUEST['nonce'] = $nonce;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nonce = wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() );
+ $_POST['nonce'] = $nonce;
+ $_GET['nonce'] = $nonce;
+ $_REQUEST['nonce'] = $nonce;
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->setup_theme();
</span><span class="cx" style="display: block; padding: 0 10px"> return $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,8 +492,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->_last_response_parsed['success'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'invalid_nonce', $this->_last_response_parsed['data']['code'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nonce = wp_create_nonce( 'trash_customize_changeset' );
- $_POST['nonce'] = $_GET['nonce'] = $_REQUEST['nonce'] = $nonce;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nonce = wp_create_nonce( 'trash_customize_changeset' );
+ $_POST['nonce'] = $nonce;
+ $_GET['nonce'] = $nonce;
+ $_REQUEST['nonce'] = $nonce;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_ajax_call( 'customize_trash' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->_last_response_parsed['success'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'non_existent_changeset', $this->_last_response_parsed['data']['code'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -567,15 +579,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->_last_response_parsed['success'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'invalid_nonce', $this->_last_response_parsed['data'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nonce = wp_create_nonce( 'customize_dismiss_autosave_or_lock' );
- $_POST['nonce'] = $_GET['nonce'] = $_REQUEST['nonce'] = $nonce;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nonce = wp_create_nonce( 'customize_dismiss_autosave_or_lock' );
+ $_POST['nonce'] = $nonce;
+ $_GET['nonce'] = $nonce;
+ $_REQUEST['nonce'] = $nonce;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST['dismiss_lock'] = $_GET['dismiss_lock'] = $_REQUEST['dismiss_lock'] = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST['dismiss_lock'] = true;
+ $_GET['dismiss_lock'] = true;
+ $_REQUEST['dismiss_lock'] = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_ajax_call( 'customize_dismiss_autosave_or_lock' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->_last_response_parsed['success'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'no_changeset_to_dismiss_lock', $this->_last_response_parsed['data'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST['dismiss_autosave'] = $_GET['dismiss_autosave'] = $_REQUEST['dismiss_autosave'] = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST['dismiss_autosave'] = true;
+ $_GET['dismiss_autosave'] = true;
+ $_REQUEST['dismiss_autosave'] = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_ajax_call( 'customize_dismiss_autosave_or_lock' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->_last_response_parsed['success'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'no_auto_draft_to_delete', $this->_last_response_parsed['data'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,12 +657,16 @@
</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">- $_POST['dismiss_autosave'] = $_GET['dismiss_autosave'] = $_REQUEST['dismiss_autosave'] = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST['dismiss_autosave'] = false;
+ $_GET['dismiss_autosave'] = false;
+ $_REQUEST['dismiss_autosave'] = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_ajax_call( 'customize_dismiss_autosave_or_lock' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $this->_last_response_parsed['success'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'changeset_lock_dismissed', $this->_last_response_parsed['data'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST['dismiss_autosave'] = $_GET['dismiss_autosave'] = $_REQUEST['dismiss_autosave'] = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST['dismiss_autosave'] = true;
+ $_GET['dismiss_autosave'] = true;
+ $_REQUEST['dismiss_autosave'] = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $r );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_get_post_autosave( $wp_customize->changeset_post_id() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'Foo', get_post( $wp_customize->changeset_post_id() )->post_content );
</span></span></pre></div>
<a id="trunktestsphpunittestscommentgetCommentAuthorUrlLinkphp"></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/comment/getCommentAuthorUrlLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,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"> public function test_global_comment() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['comment'] = $comment = reset( self::$comments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = reset( self::$comments );
+ $GLOBALS['comment'] = $comment;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url_link = get_comment_author_url_link();
</span><span class="cx" style="display: block; padding: 0 10px"> $link = $this->parseCommentAuthorUrl( $comment );
</span></span></pre></div>
<a id="trunktestsphpunittestscommentgetPageOfCommentphp"></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/comment/getPageOfComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getPageOfComment.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/comment/getPageOfComment.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +257,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = self::factory()->post->create_many( 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments_0 = $comments_1 = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments_0 = array();
+ $comments_1 = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comments_0[] = self::factory()->comment->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,8 +287,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_only_top_level_comments_should_be_included_in_older_count() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $now = time();
- $comment_parents = $comment_children = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $now = time();
+ $comment_parents = array();
+ $comment_children = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = self::factory()->comment->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/customize/manager.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -936,7 +936,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize = $manager = new WP_Customize_Manager(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $manager = new WP_Customize_Manager(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'changeset_uuid' => $uuid,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1039,7 +1039,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $previous_saved_data, json_decode( get_post( $post_id )->post_content, true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Attempt a non-transactional/incremental update.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize = $manager = new WP_Customize_Manager(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $manager = new WP_Customize_Manager(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'changeset_uuid' => $uuid,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1100,7 +1100,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $action_counts[ $action_name ] = did_action( $action_name );
</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">- $wp_customize = $manager = new WP_Customize_Manager( array( 'changeset_uuid' => $uuid ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $manager = new WP_Customize_Manager( array( 'changeset_uuid' => $uuid ) );
+ $wp_customize = $manager;
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->add_setting(
</span><span class="cx" style="display: block; padding: 0 10px"> 'scratchpad',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1142,7 +1143,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Test revisions.
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_type_support( 'customize_changeset', 'revisions' );
</span><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize = $manager = new WP_Customize_Manager( array( 'changeset_uuid' => $uuid ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $manager = new WP_Customize_Manager( array( 'changeset_uuid' => $uuid ) );
+ $wp_customize = $manager;
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $manager );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->set_post_value( 'blogname', 'Hello Surface' );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizesectionphp"></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/section.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/section.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/customize/section.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $user_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$user_ids[] = self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
+ self::$user_ids[] = self::$admin_id;
</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="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 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/db/charset.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -454,7 +454,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"> // The data above is easy to edit. Now, prepare it for the data provider.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data_provider = $multiple = $multiple_expected = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data_provider = array();
+ $multiple = array();
+ $multiple_expected = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $fields as $test_case => $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = $field;
</span><span class="cx" style="display: block; padding: 0 10px"> $expected['value'] = $expected['expected'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,7 +584,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $vars = get_defined_vars();
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $vars['charset'] );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $vars as $var_name => $var ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = $expected = $var;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = $var;
+ $expected = $var;
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $data as &$datum ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // 'charset' and 'ascii' are part of the expected return only.
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $datum['charset'], $datum['ascii'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingAutopphp"></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/formatting/Autop.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Autop.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/formatting/Autop.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,7 +415,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'select',
</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">- $content = $expected = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = array();
+ $expected = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $inlines as $inline ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $content[] = "<$inline>foo</$inline>";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,7 +544,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39307
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_that_wpautop_doses_not_add_extra_closing_p_in_figure() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content1 = $expected1 = '<figure><img src="example.jpg" /><figcaption>Caption</figcaption></figure>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content1 = '<figure><img src="example.jpg" /><figcaption>Caption</figcaption></figure>';
+ $expected1 = $content1;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content2 = '<figure>
</span><span class="cx" style="display: block; padding: 0 10px"> <img src="example.jpg" />
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingSanitizeTextFieldphp"></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/formatting/SanitizeTextField.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SanitizeTextField.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/formatting/SanitizeTextField.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_oneline = $expected['oneline'];
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_multiline = $expected['multiline'];
</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">- $expected_oneline = $expected_multiline = $expected;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_oneline = $expected;
+ $expected_multiline = $expected;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected_oneline, sanitize_text_field( $string ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected_multiline, sanitize_textarea_field( $string ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingdatephp"></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/formatting/date.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/date.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/formatting/date.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_date_from_gmt_outside_of_dst() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'timezone_string', 'Europe/London' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $gmt = $local = '2012-01-01 12:34:56';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $local = '2012-01-01 12:34:56';
+ $gmt = $local;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $local, get_date_from_gmt( $gmt ) );
</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">@@ -34,7 +35,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_gmt_from_date_outside_of_dst() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'timezone_string', 'Europe/London' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $local = $gmt = '2012-01-01 12:34:56';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $local = '2012-01-01 12:34:56';
+ $gmt = $local;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $gmt, get_gmt_from_date( $local ) );
</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">@@ -52,7 +54,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34279
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_date_and_time_from_gmt_no_timezone() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $gmt = $local = '2012-01-01 12:34:56';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $local = '2012-01-01 12:34:56';
+ $gmt = $local;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $gmt, get_date_from_gmt( $local ) );
</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="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 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/functions.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -842,7 +842,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'mbstring extension not available.' );
</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">- $old_charsets = $charsets = mb_detect_order();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $charsets = mb_detect_order();
+ $old_charsets = $charsets;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( 'EUC-JP', $charsets ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $charsets[] = 'EUC-JP';
</span><span class="cx" style="display: block; padding: 0 10px"> mb_detect_order( $charsets );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -866,7 +867,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'mbstring extension not available.' );
</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">- $old_charsets = $charsets = mb_detect_order();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $charsets = mb_detect_order();
+ $old_charsets = $charsets;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( 'EUC-JP', $charsets ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $charsets[] = 'EUC-JP';
</span><span class="cx" style="display: block; padding: 0 10px"> mb_detect_order( $charsets );
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneralarchivesphp"></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/archives.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/archives.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/general/archives.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,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"> $this->assertInternalType( 'string', $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotEmpty( $time1 = wp_cache_get( 'last_changed', 'posts' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $time1 = wp_cache_get( 'last_changed', 'posts' );
+ $this->assertNotEmpty( $time1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $num_queries + 1, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $num_queries = $wpdb->num_queries;
</span></span></pre></div>
<a id="trunktestsphpunittestsimportbasephp"></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/import/base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/import/base.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/import/base.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( ! empty( $file ), 'Path to import file is empty.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_file( $file ), 'Import file is not a file.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $authors = $mapping = $new = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $authors = array();
+ $mapping = array();
+ $new = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $i = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // each user is either mapped to a given ID, mapped to a new user
</span></span></pre></div>
<a id="trunktestsphpunittestsksesphp"></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/kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/kses.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/kses.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attr = "$name='$value'";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_attr = "$name='" . trim( $value, ';' ) . "'";
</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">- $attr = $expected_attr = $name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attr = $name;
+ $expected_attr = $name;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $string = "<a $attr>I link this</a>";
</span><span class="cx" style="display: block; padding: 0 10px"> $expect_string = "<a $expected_attr>I link this</a>";
</span></span></pre></div>
<a id="trunktestsphpunittestsmenunavmenuphp"></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/menu/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/menu/nav-menu.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/menu/nav-menu.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,11 +54,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_filter_registered_locations() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->register_nav_menu_locations( array( 'primary', 'secondary' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $old_next_theme_nav_menu_locations = $prev_theme_nav_menu_locations = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prev_theme_nav_menu_locations = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'primary' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'secondary' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'social' => 3,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $old_next_theme_nav_menu_locations = $prev_theme_nav_menu_locations;
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_next_theme_nav_menu_locations = wp_map_nav_menu_locations( $old_next_theme_nav_menu_locations, $prev_theme_nav_menu_locations );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_nav_menu_locations = array(
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionwpLoadAllOptionsphp"></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/option/wpLoadAllOptions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/wpLoadAllOptions.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/option/wpLoadAllOptions.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,6 +104,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"> function return_pre_cache_filter( $alloptions ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->alloptions = $alloptions;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->alloptions = $alloptions;
+ return $this->alloptions;
</ins><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="trunktestsphpunittestspostgetPagesphp"></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/post/getPages.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPages.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/post/getPages.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,8 +21,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = get_pages();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 3, count( $pages ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotEmpty( $time1 = wp_cache_get( 'last_changed', 'posts' ) );
- $num_queries = $wpdb->num_queries;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $time1 = wp_cache_get( 'last_changed', 'posts' );
+ $this->assertNotEmpty( $time1 );
+ $num_queries = $wpdb->num_queries;
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $pages as $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Post', $page );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpUniquePostSlugphp"></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/post/wpUniquePostSlug.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpUniquePostSlug.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/post/wpUniquePostSlug.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => $post_title,
</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">- $id = $this->post_ids[] = self::factory()->post->create( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = self::factory()->post->create( $post );
+ $this->post_ids[] = $id;
</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"> $post = get_post( $id );
</span></span></pre></div>
<a id="trunktestsphpunittestspostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/post.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _unset_current_user() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $current_user, $user_ID;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_user = $user_ID = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_user = null;
+ $user_ID = null;
</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"> // test simple valid behavior: insert and get a post
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +125,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"> // insert a post and make sure the ID is ok
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->post_ids[] = wp_insert_post( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = wp_insert_post( $post );
+ $this->post_ids[] = $id;
</ins><span class="cx" style="display: block; padding: 0 10px"> #dmp(_get_cron_array());
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_numeric( $id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $id > 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +160,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"> // insert a post and make sure the ID is ok
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->post_ids[] = wp_insert_post( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = wp_insert_post( $post );
+ $this->post_ids[] = $id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // fetch the post and make sure has the correct date and status
</span><span class="cx" style="display: block; padding: 0 10px"> $out = get_post( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +203,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"> // insert a post and make sure the ID is ok
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->post_ids[] = wp_insert_post( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = wp_insert_post( $post );
+ $this->post_ids[] = $id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // fetch the post and make sure has the correct date and status
</span><span class="cx" style="display: block; padding: 0 10px"> $out = get_post( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +244,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"> // insert a post and make sure the ID is ok
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->post_ids[] = wp_insert_post( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = wp_insert_post( $post );
+ $this->post_ids[] = $id;
</ins><span class="cx" style="display: block; padding: 0 10px"> #dmp(_get_cron_array());
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_numeric( $id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $id > 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +277,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"> // insert a post and make sure the ID is ok
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->post_ids[] = wp_insert_post( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = wp_insert_post( $post );
+ $this->post_ids[] = $id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // fetch the post and make sure has the correct date and status
</span><span class="cx" style="display: block; padding: 0 10px"> $out = get_post( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,7 +319,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"> // insert a post and make sure the ID is ok
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->post_ids[] = wp_insert_post( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = wp_insert_post( $post );
+ $this->post_ids[] = $id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // fetch the post and make sure has the correct date and status
</span><span class="cx" style="display: block; padding: 0 10px"> $out = get_post( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +360,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"> // insert a post and make sure the ID is ok
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->post_ids[] = wp_insert_post( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = wp_insert_post( $post );
+ $this->post_ids[] = $id;
</ins><span class="cx" style="display: block; padding: 0 10px"> #dmp(_get_cron_array());
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_numeric( $id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $id > 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -407,7 +415,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"> // insert a post and make sure the ID is ok
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->post_ids[] = wp_insert_post( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = wp_insert_post( $post );
+ $this->post_ids[] = $id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // fetch the post and make sure has the correct date and status
</span><span class="cx" style="display: block; padding: 0 10px"> $out = get_post( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,7 +520,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"> // insert a post and make sure the ID is ok
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->post_ids[] = wp_insert_post( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = wp_insert_post( $post );
+ $this->post_ids[] = $id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // check that there's a publish_future_post job scheduled at the right time
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $future_date, $this->_next_schedule_for_post( 'publish_future_post', $id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -540,7 +550,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"> // insert a post and make sure the ID is ok
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = $this->post_ids[] = wp_insert_post( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = wp_insert_post( $post );
+ $this->post_ids[] = $id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $plink = get_permalink( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryconditionalsphp"></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/query/conditionals.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/conditionals.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/query/conditionals.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,13 +161,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // '(about)/trackback/?$' => 'index.php?pagename=$matches[1]&tb=1'
</span><span class="cx" style="display: block; padding: 0 10px"> function test_page_trackback() {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_ids[] = $page_id = self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'parent-page',
</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">- $page_ids[] = $page_id = self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_ids[] = $page_id;
+ $page_id = self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'child-page-1',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +175,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $page_id,
</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">- $page_ids[] = $page_id = self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_ids[] = $page_id;
+ $page_ids[] = self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'child-page-2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,13 +199,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //'(about)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?pagename=$matches[1]&feed=$matches[2]'
</span><span class="cx" style="display: block; padding: 0 10px"> function test_page_feed() {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_ids[] = $page_id = self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'parent-page',
</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">- $page_ids[] = $page_id = self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_ids[] = $page_id;
+ $page_id = self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'child-page-1',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,7 +213,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $page_id,
</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">- $page_ids[] = $page_id = self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_ids[] = $page_id;
+ $page_ids[] = self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'child-page-2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,13 +237,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_page_feed_with_no_comments() {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_ids[] = $page_id = self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'parent-page',
</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">- $page_ids[] = $page_id = self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_ids[] = $page_id;
+ $page_id = self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'child-page-1',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +251,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $page_id,
</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">- $page_ids[] = $page_id = self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_ids[] = $page_id;
+ $page_ids[] = self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'child-page-2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,13 +275,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // '(about)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?pagename=$matches[1]&feed=$matches[2]'
</span><span class="cx" style="display: block; padding: 0 10px"> function test_page_feed_atom() {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_ids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_ids[] = $page_id = self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'parent-page',
</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">- $page_ids[] = $page_id = self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_ids[] = $page_id;
+ $page_id = self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'child-page-1',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +289,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $page_id,
</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">- $page_ids[] = $page_id = self::factory()->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_ids[] = $page_id;
+ $page_ids[] = self::factory()->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'child-page-2',
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryresultsphp"></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/query/results.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/results.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/query/results.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,49 +22,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> static $child_four;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$cat_ids[] = $cat_a = $factory->term->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_a = $factory->term->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'cat-a',
</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">- self::$cat_ids[] = $cat_b = $factory->term->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$cat_ids[] = $cat_a;
+ $cat_b = $factory->term->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'cat-b',
</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">- self::$cat_ids[] = $cat_c = $factory->term->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$cat_ids[] = $cat_b;
+ $cat_c = $factory->term->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'cat-c',
</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">+ self::$cat_ids[] = $cat_c;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$tag_ids[] = $tag_a = $factory->term->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag_a = $factory->term->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'tag-a',
</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">- self::$tag_ids[] = $tag_b = $factory->term->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$tag_ids[] = $tag_a;
+ $tag_b = $factory->term->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'tag-b',
</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">- self::$tag_ids[] = $tag_c = $factory->term->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$tag_ids[] = $tag_b;
+ $tag_c = $factory->term->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'tag-c',
</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">- self::$tag_ids[] = $tag_nun = $factory->term->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$tag_ids[] = $tag_c;
+ $tag_nun = $factory->term->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'tag-× ',
</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">+ self::$tag_ids[] = $tag_nun;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_ids[] = $factory->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,25 +239,28 @@
</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">- self::$post_ids[] = self::$parent_one = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$parent_one = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'parent-one',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2007-01-01 00:00:00',
</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">- self::$post_ids[] = self::$parent_two = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_ids[] = self::$parent_one;
+ self::$parent_two = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'parent-two',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2007-01-01 00:00:00',
</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">- self::$post_ids[] = self::$parent_three = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_ids[] = self::$parent_two;
+ self::$parent_three = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'parent-three',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2007-01-01 00:00:00',
</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">- self::$post_ids[] = self::$child_one = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_ids[] = self::$parent_three;
+ self::$child_one = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'child-one',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => self::$parent_one,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +267,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2007-01-01 00:00:01',
</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">- self::$post_ids[] = self::$child_two = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_ids[] = self::$child_one;
+ self::$child_two = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'child-two',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => self::$parent_one,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,7 +275,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2007-01-01 00:00:02',
</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">- self::$post_ids[] = self::$child_three = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_ids[] = self::$child_two;
+ self::$child_three = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'child-three',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => self::$parent_two,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +283,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2007-01-01 00:00:03',
</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">- self::$post_ids[] = self::$child_four = $factory->post->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$post_ids[] = self::$child_three;
+ self::$child_four = $factory->post->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'child-four',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => self::$parent_two,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,6 +291,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2007-01-01 00:00:04',
</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">+ self::$post_ids[] = self::$child_four;
</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 setUp() {
</span></span></pre></div>
<a id="trunktestsphpunittestsquerysetupPostdataphp"></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/query/setupPostdata.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/setupPostdata.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/query/setupPostdata.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,7 +403,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_setup_postdata_loop() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_content' => 'global post' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['wp_query']->post = $GLOBALS['post'] = get_post( $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['post'] = get_post( $post_id );
+ $GLOBALS['wp_query']->post = $GLOBALS['post'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = self::factory()->post->create_many( 5 );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $ids as $id ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsquerytaxQueryphp"></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/query/taxQuery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/taxQuery.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/query/taxQuery.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1298,7 +1298,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = self::factory()->post->create_many( 5 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cats = $tags = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cats = array();
+ $tags = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // need term_taxonomy_ids in addition to term_ids, so no factory
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 5; $i++ ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestpostscontrollerphp"></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-posts-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-posts-controller.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1378,8 +1378,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attachments_url = add_query_arg( 'parent', self::$post_id, $attachments_url );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $attachments_url, $links['https://api.w.org/attachment'][0]['href'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_links = $links['https://api.w.org/term'];
- $tag_link = $cat_link = $format_link = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_links = $links['https://api.w.org/term'];
+ $tag_link = null;
+ $cat_link = null;
+ $format_link = null;
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $term_links as $link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'post_tag' === $link['attributes']['taxonomy'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_link = $link;
</span></span></pre></div>
<a id="trunktestsphpunittestsuserslashesphp"></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/user/slashes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/slashes.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/user/slashes.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests the controller function that expects slashed data
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_add_user() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST = $_GET = $_REQUEST = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST = array();
+ $_GET = array();
+ $_REQUEST = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['user_login'] = 'slash_example_user_1';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['pass1'] = 'password';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['pass2'] = 'password';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +51,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $this->slash_7, $user->display_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $this->slash_3, $user->description );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST = $_GET = $_REQUEST = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST = array();
+ $_GET = array();
+ $_REQUEST = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['user_login'] = 'slash_example_user_2';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['pass1'] = 'password';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['pass2'] = 'password';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +82,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_edit_user() {
</span><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->user->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST = $_GET = $_REQUEST = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST = array();
+ $_GET = array();
+ $_REQUEST = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['role'] = 'subscriber';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['email'] = 'user1@example.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['first_name'] = $this->slash_1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +103,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $this->slash_7, $user->display_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $this->slash_3, $user->description );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST = $_GET = $_REQUEST = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST = array();
+ $_GET = array();
+ $_REQUEST = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['role'] = 'subscriber';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['email'] = 'user2@example.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['first_name'] = $this->slash_2;
</span></span></pre></div>
<a id="trunktestsphpunittestsuserwpSetCurrentUserphp"></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/user/wpSetCurrentUser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpSetCurrentUser.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/user/wpSetCurrentUser.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,8 +9,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $user_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$user_ids[] = self::$user_id = $factory->user->create();
- self::$user_ids[] = self::$user_id2 = $factory->user->create( array( 'user_login' => 'foo' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$user_id = $factory->user->create();
+ self::$user_ids[] = self::$user_id;
+ self::$user_id2 = $factory->user->create( array( 'user_login' => 'foo' ) );
+ self::$user_ids[] = self::$user_id2;
</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"> public function test_set_by_id() {
</span></span></pre></div>
<a id="trunktestsphpunittestsuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php 2019-07-02 03:28:03 UTC (rev 45587)
+++ trunk/tests/phpunit/tests/user.php 2019-07-02 04:43:01 UTC (rev 45588)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected $user_data;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$user_ids[] = self::$contrib_id = $factory->user->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$contrib_id = $factory->user->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'user1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_nicename' => 'userone',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,8 +33,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'I am a WordPress user that cares about privacy.',
</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">+ self::$user_ids[] = self::$contrib_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$user_ids[] = self::$author_id = $factory->user->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$author_id = $factory->user->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'author_login',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'author@email.com',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,15 +42,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => '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">+ self::$user_ids[] = self::$author_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$user_ids[] = self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
- self::$user_ids[] = self::$editor_id = $factory->user->create(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
+ self::$user_ids[] = self::$admin_id;
+ self::$editor_id = $factory->user->create(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'editor',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'test@test.com',
</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">- self::$user_ids[] = self::$sub_id = $factory->user->create( array( 'role' => 'subscriber' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$user_ids[] = self::$editor_id;
+ self::$sub_id = $factory->user->create( array( 'role' => 'subscriber' ) );
+ self::$user_ids[] = self::$sub_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$_author = get_user_by( 'ID', 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">@@ -1374,7 +1379,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35715
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_edit_user_blank_pw() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST = $_GET = $_REQUEST = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST = array();
+ $_GET = array();
+ $_REQUEST = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['role'] = 'subscriber';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['email'] = 'user1@example.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['user_login'] = 'user_login1';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1390,7 +1397,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'pass', $response->get_error_code() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check new user with password set.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST['pass1'] = $_POST['pass2'] = 'password';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST['pass1'] = 'password';
+ $_POST['pass2'] = 'password';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = edit_user();
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_user_by( 'ID', $user_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1401,7 +1409,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check updating user with empty password.
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['nickname'] = 'nickname_updated';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST['pass1'] = $_POST['pass2'] = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST['pass1'] = '';
+ $_POST['pass2'] = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = edit_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1550,7 +1559,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 42564
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_edit_user_role_update() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST = $_GET = $_REQUEST = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST = array();
+ $_GET = array();
+ $_REQUEST = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $administrator = self::factory()->user->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre>
</div>
</div>
</body>
</html>