<!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>[51565] trunk/tests/phpunit/tests: Tests: Replace `assertRegExp()` with `assertMatchesRegularExpression()`.</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/51565">51565</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/51565","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-08-06 21:52:06 +0000 (Fri, 06 Aug 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Tests: Replace `assertRegExp()` with `assertMatchesRegularExpression()`.
The `assertRegExp()` and `assertNotRegExp()` methods were hard deprecated in PHPUnit 9.1 and the functionality will be removed in PHPUnit 10.0.
The `assertMatchesRegularExpression()` and `assertDoesNotMatchRegularExpression()` methods were introduced as a replacement in PHPUnit 9.1.
These new PHPUnit methods are polyfilled by the PHPUnit Polyfills and switching to them will future-proof the tests some more.
References:
* https://github.com/sebastianbergmann/phpunit/blob/9.1.5/ChangeLog-9.1.md<a href="https://core.trac.wordpress.org/ticket/910">#910</a>---2020-04-03
* https://github.com/sebastianbergmann/phpunit/issues/4085
* https://github.com/sebastianbergmann/phpunit/issues/4088
Follow-up to [51559-51564].
Props jrf.
See <a href="https://core.trac.wordpress.org/ticket/46149">#46149</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsajaxResponsephp">trunk/tests/phpunit/tests/ajax/Response.php</a></li>
<li><a href="#trunktestsphpunittestsavatarphp">trunk/tests/phpunit/tests/avatar.php</a></li>
<li><a href="#trunktestsphpunittestscategorywpDropdownCategoriesphp">trunk/tests/phpunit/tests/category/wpDropdownCategories.php</a></li>
<li><a href="#trunktestsphpunittestscategorywpListCategoriesphp">trunk/tests/phpunit/tests/category/wpListCategories.php</a></li>
<li><a href="#trunktestsphpunittestscommentcommentFormphp">trunk/tests/phpunit/tests/comment/commentForm.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenusphp">trunk/tests/phpunit/tests/customize/nav-menus.php</a></li>
<li><a href="#trunktestsphpunittestscustomizewidgetsphp">trunk/tests/phpunit/tests/customize/widgets.php</a></li>
<li><a href="#trunktestsphpunittestsdatequeryphp">trunk/tests/phpunit/tests/date/query.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
<li><a href="#trunktestsphpunittestsmetaqueryphp">trunk/tests/phpunit/tests/meta/query.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPostsByAuthorSqlphp">trunk/tests/phpunit/tests/post/getPostsByAuthorSql.php</a></li>
<li><a href="#trunktestsphpunittestspostnavmenuphp">trunk/tests/phpunit/tests/post/nav-menu.php</a></li>
<li><a href="#trunktestsphpunittestsposttemplatephp">trunk/tests/phpunit/tests/post/template.php</a></li>
<li><a href="#trunktestsphpunittestsqueryresultsphp">trunk/tests/phpunit/tests/query/results.php</a></li>
<li><a href="#trunktestsphpunitteststermwpGenerateTagCloudphp">trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsphp">trunk/tests/phpunit/tests/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsajaxResponsephp"></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/Response.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/Response.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/ajax/Response.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,6 +100,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check the XML tag.
</span><span class="cx" style="display: block; padding: 0 10px"> $contents = ob_get_clean();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/<\?xml\s+version=\'1.0\'\s+encoding=\'' . preg_quote( get_option( 'blog_charset' ) ) . '\'\s+standalone=\'yes\'\?>/', $contents );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/<\?xml\s+version=\'1.0\'\s+encoding=\'' . preg_quote( get_option( 'blog_charset' ) ) . '\'\s+standalone=\'yes\'\?>/', $contents );
</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="trunktestsphpunittestsavatarphp"></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/avatar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/avatar.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/avatar.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +257,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_data = get_avatar_data( $comment );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_avatar_comment_type( $comment_type ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegexp( '|^http?://[0-9]+.gravatar.com/avatar/[0-9a-f]{32}\?|', $actual_data['url'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '|^http?://[0-9]+.gravatar.com/avatar/[0-9a-f]{32}\?|', $actual_data['url'] );
</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="trunktestsphpunittestscategorywpDropdownCategoriesphp"></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/category/wpDropdownCategories.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/category/wpDropdownCategories.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/category/wpDropdownCategories.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dropdown_categories = wp_dropdown_categories( $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test to see if it contains the "required" attribute.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/<select[^>]+required/', $dropdown_categories );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/<select[^>]+required/', $dropdown_categories );
</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="trunktestsphpunittestscategorywpListCategoriesphp"></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/category/wpListCategories.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/category/wpListCategories.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/category/wpListCategories.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,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"> $this->assertNotRegExp( '/class="[^"]*cat-item-' . $c1 . '[^"]*current-cat[^"]*"/', $found );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/class="[^"]*cat-item-' . $c2 . '[^"]*current-cat[^"]*"/', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/class="[^"]*cat-item-' . $c2 . '[^"]*current-cat[^"]*"/', $found );
</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_class_containing_current_cat_parent() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,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">- $this->assertRegExp( '/class="[^"]*cat-item-' . $c1 . '[^"]*current-cat-parent[^"]*"/', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/class="[^"]*cat-item-' . $c1 . '[^"]*current-cat-parent[^"]*"/', $found );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotRegExp( '/class="[^"]*cat-item-' . $c2 . '[^"]*current-cat-parent[^"]*"/', $found );
</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">@@ -67,9 +67,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/class="[^"]*cat-item-' . $cats[0] . '[^"]*current-cat[^"]*"/', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/class="[^"]*cat-item-' . $cats[0] . '[^"]*current-cat[^"]*"/', $found );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotRegExp( '/class="[^"]*cat-item-' . $cats[1] . '[^"]*current[^"]*"/', $found );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/class="[^"]*cat-item-' . $cats[2] . '[^"]*current-cat[^"]*"/', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/class="[^"]*cat-item-' . $cats[2] . '[^"]*current-cat[^"]*"/', $found );
</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">@@ -650,8 +650,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/class="[^"]*cat-item-' . $parent . '[^"]*current-cat-ancestor[^"]*"/', $actual );
- $this->assertRegExp( '/class="[^"]*cat-item-' . $child . '[^"]*current-cat-ancestor[^"]*"/', $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/class="[^"]*cat-item-' . $parent . '[^"]*current-cat-ancestor[^"]*"/', $actual );
+ $this->assertMatchesRegularExpression( '/class="[^"]*cat-item-' . $child . '[^"]*current-cat-ancestor[^"]*"/', $actual );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotRegExp( '/class="[^"]*cat-item-' . $grandchild . '[^"]*current-cat-ancestor[^"]*"/', $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotRegExp( '/class="[^"]*cat-item-' . $child2 . '[^"]*current-cat-ancestor[^"]*"/', $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestscommentcommentFormphp"></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/commentForm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/commentForm.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/comment/commentForm.php 2021-08-06 21:52:06 UTC (rev 51565)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> $button = '<input name="foo-name" type="submit" id="foo-id" class="foo-class" value="foo-label" />';
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden = get_comment_id_fields( $p );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '|<p class="form\-submit">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '|<p class="form\-submit">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
</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_custom_submit_button() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $button = '<input name="foo-name" type="submit" id="foo-id" class="foo-class" value="foo-label" />';
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden = get_comment_id_fields( $p );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '|<p class="my\-custom\-submit\-field">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '|<p class="my\-custom\-submit\-field">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
</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">@@ -75,7 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $button = '<input name="foo-name" type="submit" id="foo-id" class="foo-class" value="foo-label" />';
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden = get_comment_id_fields( $p );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '|<p class="form\-submit">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '|<p class="form\-submit">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
</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 filter_comment_form_defaults( $defaults ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'option_show_comments_cookies_opt_in', '__return_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">- $this->assertRegExp( '|<p class="comment\-form\-cookies\-consent">.*?</p>|', $form );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '|<p class="comment\-form\-cookies\-consent">.*?</p>|', $form );
</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="trunktestsphpunittestscustomizenavmenusphp"></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/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menus.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/customize/nav-menus.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -770,7 +770,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_types ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_types as $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'available-menu-items-post_type-' . esc_attr( $type->name ), $template );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '#<h4 class="accordion-section-title".*>\s*' . esc_html( $type->labels->name ) . '#', $template );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '#<h4 class="accordion-section-title".*>\s*' . esc_html( $type->labels->name ) . '#', $template );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-type="post_type"', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-object="' . esc_attr( $type->name ) . '"', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-type_label="' . esc_attr( $type->labels->singular_name ) . '"', $template );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -781,7 +781,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $taxonomies ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $taxonomies as $tax ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'available-menu-items-taxonomy-' . esc_attr( $tax->name ), $template );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '#<h4 class="accordion-section-title".*>\s*' . esc_html( $tax->labels->name ) . '#', $template );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '#<h4 class="accordion-section-title".*>\s*' . esc_html( $tax->labels->name ) . '#', $template );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-type="taxonomy"', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-object="' . esc_attr( $tax->name ) . '"', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-type_label="' . esc_attr( $tax->labels->singular_name ) . '"', $template );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -789,7 +789,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"> $this->assertStringContainsString( 'available-menu-items-custom_type', $template );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '#<h4 class="accordion-section-title".*>\s*Custom#', $template );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '#<h4 class="accordion-section-title".*>\s*Custom#', $template );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-type="custom_type"', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-object="custom_object"', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-type_label="Custom Type"', $template );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1013,7 +1013,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $save_action_count + 1, did_action( 'customize_save_nav_menus_created_posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $drafted_post_ids as $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'publish', get_post_status( $post_id ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/^auto-draft-\d+$/', get_post( $post_id )->post_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/^auto-draft-\d+$/', get_post( $post_id )->post_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( get_post_meta( $post_id, '_customize_draft_post_name', true ) );
</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="trunktestsphpunittestscustomizewidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/widgets.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/customize/widgets.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,8 +610,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $params = $control->json();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'widget_form', $params['type'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '#^<li[^>]+>\s*</li>$#', $params['content'] );
- $this->assertRegExp( '#^<div[^>]*class=\'widget\'[^>]*#s', $params['widget_control'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '#^<li[^>]+>\s*</li>$#', $params['content'] );
+ $this->assertMatchesRegularExpression( '#^<div[^>]*class=\'widget\'[^>]*#s', $params['widget_control'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( '<div class="widget-content"></div>', $params['widget_control'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringNotContainsString( '<input class="widefat"', $params['widget_control'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( '<input class="widefat"', $params['widget_content'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsdatequeryphp"></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/date/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/query.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/date/query.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -713,7 +713,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // $compare value is floating point - use regex to account for
</span><span class="cx" style="display: block; padding: 0 10px"> // varying precision on different PHP installations.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i' \) = 5\.150*/", $wpdb->remove_placeholder_escape( $found ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( "/DATE_FORMAT\( post_date, '%H\.%i' \) = 5\.150*/", $wpdb->remove_placeholder_escape( $found ) );
</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_build_time_query_hour_minute_second() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -724,7 +724,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // $compare value is floating point - use regex to account for
</span><span class="cx" style="display: block; padding: 0 10px"> // varying precision on different PHP installations.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i%s' \) = 5\.15350*/", $wpdb->remove_placeholder_escape( $found ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( "/DATE_FORMAT\( post_date, '%H\.%i%s' \) = 5\.15350*/", $wpdb->remove_placeholder_escape( $found ) );
</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_build_time_query_minute_second() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -735,7 +735,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // $compare value is floating point - use regex to account for
</span><span class="cx" style="display: block; padding: 0 10px"> // varying precision on different PHP installations.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( "/DATE_FORMAT\( post_date, '0\.%i%s' \) = 0\.15350*/", $wpdb->remove_placeholder_escape( $found ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( "/DATE_FORMAT\( post_date, '0\.%i%s' \) = 0\.15350*/", $wpdb->remove_placeholder_escape( $found ) );
</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="trunktestsphpunittestsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/functions.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1207,7 +1207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 20; $i += 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $id = wp_unique_id( 'foo-' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/^foo-\d+$/', $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/^foo-\d+$/', $id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $ids[] = $id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $ids, array_unique( $ids ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsmetaqueryphp"></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/meta/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta/query.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/meta/query.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -925,7 +925,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sql = $query->get_sql( 'post', $wpdb->posts, 'ID', $this );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use regex because we don't care about the whitespace before OR.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( "/{$wpdb->postmeta}\.meta_key = \'exclude\'\s+OR/", $sql['where'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( "/{$wpdb->postmeta}\.meta_key = \'exclude\'\s+OR/", $sql['where'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringNotContainsString( "{$wpdb->postmeta}.post_id IS NULL", $sql['where'] );
</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="trunktestsphpunittestspostgetPostsByAuthorSqlphp"></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/getPostsByAuthorSql.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPostsByAuthorSql.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/post/getPostsByAuthorSql.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_full_true() {
</span><span class="cx" style="display: block; padding: 0 10px"> $maybe_string = get_posts_by_author_sql( 'post', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/^WHERE /', $maybe_string );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/^WHERE /', $maybe_string );
</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_full_false() {
</span></span></pre></div>
<a id="trunktestsphpunittestspostnavmenuphp"></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/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/nav-menu.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/post/nav-menu.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,7 +460,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"> // The markup should include whitespace between <li>'s.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/\s<li.*>|<\/li>\s/U', $menu );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/\s<li.*>|<\/li>\s/U', $menu );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotRegExp( '/<\/li><li.*>/U', $menu );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Whitespace suppressed.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,7 +474,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The markup should not include whitespace around <li>'s.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotRegExp( '/\s<li.*>|<\/li>\s/U', $menu );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/><li.*>|<\/li></U', $menu );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/><li.*>|<\/li></U', $menu );
</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="trunktestsphpunittestsposttemplatephp"></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/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/template.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/post/template.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +340,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">- $this->assertRegExp( '/<select[^>]+class=\'bar\'/', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/<select[^>]+class=\'bar\'/', $found );
</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">@@ -419,13 +419,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu = wp_nav_menu( array( 'echo' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // After falling back, the 'before' argument should be set and output as '<ul>'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/<div class="menu"><ul>/', $menu );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/<div class="menu"><ul>/', $menu );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // After falling back, the 'after' argument should be set and output as '</ul>'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/<\/ul><\/div>/', $menu );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/<\/ul><\/div>/', $menu );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // After falling back, the markup should include whitespace around <li>'s.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/\s<li.*>|<\/li>\s/U', $menu );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/\s<li.*>|<\/li>\s/U', $menu );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotRegExp( '/><li.*>|<\/li></U', $menu );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No menus + wp_nav_menu() falls back to wp_page_menu(), this time without a container.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,7 +437,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"> // After falling back, the empty 'container' argument should still return a container element.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/<div class="menu">/', $menu );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/<div class="menu">/', $menu );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No menus + wp_nav_menu() falls back to wp_page_menu(), this time without white-space.
</span><span class="cx" style="display: block; padding: 0 10px"> $menu = wp_nav_menu(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -449,7 +449,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // After falling back, the markup should not include whitespace around <li>'s.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotRegExp( '/\s<li.*>|<\/li>\s/U', $menu );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/><li.*>|<\/li></U', $menu );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/><li.*>|<\/li></U', $menu );
</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="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 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/query/results.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -795,7 +795,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $this->q->query( array( 'post_type' => 'any' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $posts );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '#AND 1=0#', $this->q->request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '#AND 1=0#', $this->q->request );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $wp_post_types ) as $slug ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_post_types[ $slug ]->exclude_from_search = false;
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpGenerateTagCloudphp"></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/term/wpGenerateTagCloud.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,8 +129,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( "|^<ul class='wp-tag-cloud' role='list'>|", $found );
- $this->assertRegExp( "|</ul>\n|", $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( "|^<ul class='wp-tag-cloud' role='list'>|", $found );
+ $this->assertMatchesRegularExpression( "|</ul>\n|", $found );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( '>' . $tags[0]->name . '<', $found );
</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">@@ -184,8 +184,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( "|^<ul class='wp-tag-cloud' role='list'>|", $found );
- $this->assertRegExp( "|</ul>\n|", $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( "|^<ul class='wp-tag-cloud' role='list'>|", $found );
+ $this->assertMatchesRegularExpression( "|</ul>\n|", $found );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $tags as $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( '>' . $tag->name . '<', $found );
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets.php 2021-08-06 21:45:32 UTC (rev 51564)
+++ trunk/tests/phpunit/tests/widgets.php 2021-08-06 21:52:06 UTC (rev 51565)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -798,7 +798,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unregister_widget( 'WP_Widget_Text' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertRegExp( '/<span class="special widget_text">/', $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '/<span class="special widget_text">/', $actual );
</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>
</div>
</body>
</html>