<!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>[51331] trunk/tests/phpunit: Build/Test Tools: Replace `assertInternalType()` usage in unit 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/51331">51331</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/51331","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-07-05 17:21:53 +0000 (Mon, 05 Jul 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Build/Test Tools: Replace `assertInternalType()` usage in unit tests.
The `assertInternalType()` and `assertNotInternalType()` methods are deprecated in PHPUnit 8 and removed in PHPUnit 9.
While WordPress test suite currently only supports PHPUnit up to 7.5.x, this allows us to switch to newer assertions ahead of adding full support for PHPUnit 8+.
These methods introduced in PHPUnit 7.5 should be used as an alternative:
* `assertIsArray()`
* `assertIsBool()`
* `assertIsFloat()`
* `assertIsInt()`
* `assertIsNumeric()`
* `assertIsObject()`
* `assertIsResource()`
* `assertIsString()`
* `assertIsScalar()`
* `assertIsCallable()`
* `assertIsIterable()`
* `assertIsNotArray()`
* `assertIsNotBool()`
* `assertIsNotFloat()`
* `assertIsNotInt()`
* `assertIsNotNumeric()`
* `assertIsNotObject()`
* `assertIsNotResource()`
* `assertIsNotString()`
* `assertIsNotScalar()`
* `assertIsNotCallable()`
* `assertIsNotIterable()`
As WordPress currently uses PHPUnit 5.7.x to run tests on PHP 5.6, polyfills for these methods are now added to the `WP_UnitTestCase` class for PHPUnit < 7.5.
Props pbearne, jrf, dd32, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/53491">#53491</a>. See <a href="https://core.trac.wordpress.org/ticket/46149">#46149</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#trunktestsphpunittestsadminbarphp">trunk/tests/phpunit/tests/adminbar.php</a></li>
<li><a href="#trunktestsphpunittestsajaxCustomizeManagerphp">trunk/tests/phpunit/tests/ajax/CustomizeManager.php</a></li>
<li><a href="#trunktestsphpunittestsblocksblockeditorphp">trunk/tests/phpunit/tests/blocks/block-editor.php</a></li>
<li><a href="#trunktestsphpunittestsblocksrenderphp">trunk/tests/phpunit/tests/blocks/render.php</a></li>
<li><a href="#trunktestsphpunittestsbookmarkgetBookmarkphp">trunk/tests/phpunit/tests/bookmark/getBookmark.php</a></li>
<li><a href="#trunktestsphpunittestscommentmetaCachephp">trunk/tests/phpunit/tests/comment/metaCache.php</a></li>
<li><a href="#trunktestsphpunittestscommentqueryphp">trunk/tests/phpunit/tests/comment/query.php</a></li>
<li><a href="#trunktestsphpunittestscustomizecustomcsssettingphp">trunk/tests/phpunit/tests/customize/custom-css-setting.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenuitemsettingphp">trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenusettingphp">trunk/tests/phpunit/tests/customize/nav-menu-setting.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenusphp">trunk/tests/phpunit/tests/customize/nav-menus.php</a></li>
<li><a href="#trunktestsphpunittestscustomizepanelphp">trunk/tests/phpunit/tests/customize/panel.php</a></li>
<li><a href="#trunktestsphpunittestscustomizepartialphp">trunk/tests/phpunit/tests/customize/partial.php</a></li>
<li><a href="#trunktestsphpunittestscustomizesectionphp">trunk/tests/phpunit/tests/customize/section.php</a></li>
<li><a href="#trunktestsphpunittestscustomizeselectiverefreshajaxphp">trunk/tests/phpunit/tests/customize/selective-refresh-ajax.php</a></li>
<li><a href="#trunktestsphpunittestscustomizeselectiverefreshphp">trunk/tests/phpunit/tests/customize/selective-refresh.php</a></li>
<li><a href="#trunktestsphpunittestscustomizesettingphp">trunk/tests/phpunit/tests/customize/setting.php</a></li>
<li><a href="#trunktestsphpunittestscustomizewidgetsphp">trunk/tests/phpunit/tests/customize/widgets.php</a></li>
<li><a href="#trunktestsphpunittestsdatecurrentTimephp">trunk/tests/phpunit/tests/date/currentTime.php</a></li>
<li><a href="#trunktestsphpunittestsdbphp">trunk/tests/phpunit/tests/db.php</a></li>
<li><a href="#trunktestsphpunittestsformattingSanitizePostphp">trunk/tests/phpunit/tests/formatting/SanitizePost.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionslistFilesphp">trunk/tests/phpunit/tests/functions/listFiles.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionswpGetMimeTypesphp">trunk/tests/phpunit/tests/functions/wpGetMimeTypes.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionswpRemoteFopenphp">trunk/tests/phpunit/tests/functions/wpRemoteFopen.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
<li><a href="#trunktestsphpunittestsgeneraltemplatephp">trunk/tests/phpunit/tests/general/template.php</a></li>
<li><a href="#trunktestsphpunittestsgeneralwpGetArchivesphp">trunk/tests/phpunit/tests/general/wpGetArchives.php</a></li>
<li><a href="#trunktestsphpunittestshttpbasephp">trunk/tests/phpunit/tests/http/base.php</a></li>
<li><a href="#trunktestsphpunittestshttpfunctionsphp">trunk/tests/phpunit/tests/http/functions.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
<li><a href="#trunktestsphpunittestsimageheaderphp">trunk/tests/phpunit/tests/image/header.php</a></li>
<li><a href="#trunktestsphpunittestsimageintermediateSizephp">trunk/tests/phpunit/tests/image/intermediateSize.php</a></li>
<li><a href="#trunktestsphpunittestsimagesiteIconphp">trunk/tests/phpunit/tests/image/siteIcon.php</a></li>
<li><a href="#trunktestsphpunittestsincludesfactoryphp">trunk/tests/phpunit/tests/includes/factory.php</a></li>
<li><a href="#trunktestsphpunittestsl10nphp">trunk/tests/phpunit/tests/l10n.php</a></li>
<li><a href="#trunktestsphpunittestsmediagetAttachmentTaxonomiesphp">trunk/tests/phpunit/tests/media/getAttachmentTaxonomies.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
<li><a href="#trunktestsphpunittestsmetaphp">trunk/tests/phpunit/tests/meta.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitecleanDirsizeCachephp">trunk/tests/phpunit/tests/multisite/cleanDirsizeCache.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitenetworkphp">trunk/tests/phpunit/tests/multisite/network.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesiteMetaphp">trunk/tests/phpunit/tests/multisite/siteMeta.php</a></li>
<li><a href="#trunktestsphpunittestsoembedcontrollerphp">trunk/tests/phpunit/tests/oembed/controller.php</a></li>
<li><a href="#trunktestsphpunittestsoptionmultisitephp">trunk/tests/phpunit/tests/option/multisite.php</a></li>
<li><a href="#trunktestsphpunittestspostformatsphp">trunk/tests/phpunit/tests/post/formats.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPageByPathphp">trunk/tests/phpunit/tests/post/getPageByPath.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPostTypeLabelsphp">trunk/tests/phpunit/tests/post/getPostTypeLabels.php</a></li>
<li><a href="#trunktestsphpunittestspostmetaphp">trunk/tests/phpunit/tests/post/meta.php</a></li>
<li><a href="#trunktestsphpunittestspostobjectsphp">trunk/tests/phpunit/tests/post/objects.php</a></li>
<li><a href="#trunktestsphpunittestspostqueryphp">trunk/tests/phpunit/tests/post/query.php</a></li>
<li><a href="#trunktestsphpunittestsposttypesphp">trunk/tests/phpunit/tests/post/types.php</a></li>
<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>
<li><a href="#trunktestsphpunittestsqueryresultsphp">trunk/tests/phpunit/tests/query/results.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestattachmentscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestcommentscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpostmetafieldsphp">trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestrequestphp">trunk/tests/phpunit/tests/rest-api/rest-request.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestserverphp">trunk/tests/phpunit/tests/rest-api/rest-server.php</a></li>
<li><a href="#trunktestsphpunittestsrestapiresttermmetafieldsphp">trunk/tests/phpunit/tests/rest-api/rest-term-meta-fields.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestuserscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-users-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrewritepermastructsphp">trunk/tests/phpunit/tests/rewrite/permastructs.php</a></li>
<li><a href="#trunktestsphpunittestsrewritephp">trunk/tests/phpunit/tests/rewrite.php</a></li>
<li><a href="#trunktestsphpunitteststaxonomygetObjectTaxonomiesphp">trunk/tests/phpunit/tests/taxonomy/getObjectTaxonomies.php</a></li>
<li><a href="#trunktestsphpunitteststaxonomyphp">trunk/tests/phpunit/tests/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermphp">trunk/tests/phpunit/tests/term/getTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermsphp">trunk/tests/phpunit/tests/term/getTerms.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTheTermsphp">trunk/tests/phpunit/tests/term/getTheTerms.php</a></li>
<li><a href="#trunktestsphpunitteststermmetaphp">trunk/tests/phpunit/tests/term/meta.php</a></li>
<li><a href="#trunktestsphpunitteststermtermExistsphp">trunk/tests/phpunit/tests/term/termExists.php</a></li>
<li><a href="#trunktestsphpunitteststermwpGenerateTagCloudphp">trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php</a></li>
<li><a href="#trunktestsphpunitteststermwpGetObjectTermsphp">trunk/tests/phpunit/tests/term/wpGetObjectTerms.php</a></li>
<li><a href="#trunktestsphpunitteststermwpInsertTermphp">trunk/tests/phpunit/tests/term/wpInsertTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermwpSetObjectTermsphp">trunk/tests/phpunit/tests/term/wpSetObjectTerms.php</a></li>
<li><a href="#trunktestsphpunitteststermwpUpdateTermphp">trunk/tests/phpunit/tests/term/wpUpdateTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermphp">trunk/tests/phpunit/tests/term.php</a></li>
<li><a href="#trunktestsphpunitteststhemegetThemeStarterContentphp">trunk/tests/phpunit/tests/theme/getThemeStarterContent.php</a></li>
<li><a href="#trunktestsphpunittestsusermultisitephp">trunk/tests/phpunit/tests/user/multisite.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsmediawidgetphp">trunk/tests/phpunit/tests/widgets/media-widget.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsphp">trunk/tests/phpunit/tests/widgets.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcmwgetPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcmwgetRecentPostsphp">trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpdeleteTermphp">trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpeditPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpeditTermphp">trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetCommentphp">trunk/tests/phpunit/tests/xmlrpc/wp/getComment.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetCommentsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetMediaItemphp">trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetOptionsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getOptions.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetPagephp">trunk/tests/phpunit/tests/xmlrpc/wp/getPage.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetPostTypephp">trunk/tests/phpunit/tests/xmlrpc/wp/getPostType.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetPostTypesphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPostTypes.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetRevisionsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetTermphp">trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetTermsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetUserphp">trunk/tests/phpunit/tests/xmlrpc/wp/getUser.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetUsersphp">trunk/tests/phpunit/tests/xmlrpc/wp/getUsers.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpnewCommentphp">trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpnewPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpsetOptionsphp">trunk/tests/phpunit/tests/xmlrpc/wp/setOptions.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpuploadFilephp">trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludestestcasephp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/includes/testcase.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,4 +32,344 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function assertEqualsWithDelta( $expected, $actual, $delta, $message = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> static::assertEquals( $expected, $actual, $message, $delta );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Asserts that a variable is of type array.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsArray( $actual, $message = '' ) {
+ static::assertInternalType( 'array', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is of type bool.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsBool( $actual, $message = '' ) {
+ static::assertInternalType( 'bool', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is of type float.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsFloat( $actual, $message = '' ) {
+ static::assertInternalType( 'float', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is of type int.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsInt( $actual, $message = '' ) {
+ static::assertInternalType( 'int', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is of type numeric.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsNumeric( $actual, $message = '' ) {
+ static::assertInternalType( 'numeric', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is of type object.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsObject( $actual, $message = '' ) {
+ static::assertInternalType( 'object', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is of type resource.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsResource( $actual, $message = '' ) {
+ static::assertInternalType( 'resource', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is of type string.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsString( $actual, $message = '' ) {
+ static::assertInternalType( 'string', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is of type scalar.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsScalar( $actual, $message = '' ) {
+ static::assertInternalType( 'scalar', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is of type callable.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsCallable( $actual, $message = '' ) {
+ static::assertInternalType( 'callable', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is of type iterable.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * Support for `iterable` was only added to `Assert::assertNotInternalType()`
+ * in PHPUnit 7.1.0, so this polyfill cannot use a direct fall-through
+ * to that functionality until WordPress test suite requires PHPUnit 7.1.0
+ * as the minimum version.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsIterable( $actual, $message = '' ) {
+ static::assertTrue( is_iterable( $actual ), $message );
+ }
+
+ /**
+ * Asserts that a variable is not of type array.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsNotArray( $actual, $message = '' ) {
+ static::assertNotInternalType( 'array', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is not of type bool.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsNotBool( $actual, $message = '' ) {
+ static::assertNotInternalType( 'bool', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is not of type float.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsNotFloat( $actual, $message = '' ) {
+ static::assertNotInternalType( 'float', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is not of type int.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsNotInt( $actual, $message = '' ) {
+ static::assertNotInternalType( 'int', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is not of type numeric.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsNotNumeric( $actual, $message = '' ) {
+ static::assertNotInternalType( 'numeric', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is not of type object.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsNotObject( $actual, $message = '' ) {
+ static::assertNotInternalType( 'object', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is not of type resource.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsNotResource( $actual, $message = '' ) {
+ static::assertNotInternalType( 'resource', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is not of type string.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsNotString( $actual, $message = '' ) {
+ static::assertNotInternalType( 'string', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is not of type scalar.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsNotScalar( $actual, $message = '' ) {
+ static::assertNotInternalType( 'scalar', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is not of type callable.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsNotCallable( $actual, $message = '' ) {
+ static::assertNotInternalType( 'callable', $actual, $message );
+ }
+
+ /**
+ * Asserts that a variable is not of type iterable.
+ *
+ * This method has been backported from a more recent PHPUnit version,
+ * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+ *
+ * Support for `iterable` was only added to `Assert::assertNotInternalType()`
+ * in PHPUnit 7.1.0, so this polyfill cannot use a direct fall-through
+ * to that functionality until WordPress test suite requires PHPUnit 7.1.0
+ * as the minimum version.
+ *
+ * @since 5.9.0
+ *
+ * @param mixed $actual The value to check.
+ * @param string $message Optional. Message to display when the assertion fails.
+ */
+ public static function assertIsNotIterable( $actual, $message = '' ) {
+ static::assertFalse( is_iterable( $actual ), $message );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</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 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/adminbar.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get primary blog.
</span><span class="cx" style="display: block; padding: 0 10px"> $primary = get_active_blog_for_user( self::$editor_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $primary );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $primary );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No Site menu as the user isn't a member of this blog.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $node_site_name );
</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 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/ajax/CustomizeManager.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +286,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</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->assertTrue( $this->_last_response_parsed['success'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $this->_last_response_parsed['data'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $this->_last_response_parsed['data'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'publish', $this->_last_response_parsed['data']['changeset_status'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'next_changeset_uuid', $this->_last_response_parsed['data'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,7 +325,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['customize_changeset_title'] = 'Published';
</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->assertTrue( $this->_last_response_parsed['success'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $this->_last_response_parsed['data'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $this->_last_response_parsed['data'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'publish', $this->_last_response_parsed['data']['changeset_status'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'next_changeset_uuid', $this->_last_response_parsed['data'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsblocksblockeditorphp"></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/blocks/block-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/block-editor.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/blocks/block-editor.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 16, $settings );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $settings['alignWide'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $settings['allowedMimeTypes'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $settings['allowedMimeTypes'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $settings['allowedBlockTypes'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,7 +264,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['imageSizes']
</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->assertInternalType( 'int', $settings['maxUploadFileSize'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $settings['maxUploadFileSize'] );
</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="trunktestsphpunittestsblocksrenderphp"></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/blocks/render.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/render.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/blocks/render.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,7 +324,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $rendered = $block_type->render();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '10', $rendered );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $rendered );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $rendered );
</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_dynamic_block_gets_inner_html() {
</span></span></pre></div>
<a id="trunktestsphpunittestsbookmarkgetBookmarkphp"></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/bookmark/getBookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/bookmark/getBookmark.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/bookmark/getBookmark.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,8 +349,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $contexts as $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $bookmark = get_bookmark( self::$bookmark->link_id, OBJECT, $context );
</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->assertInternalType( 'int', $bookmark->link_id );
- $this->assertInternalType( 'int', $bookmark->link_rating );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $bookmark->link_id );
+ $this->assertIsInt( $bookmark->link_rating );
</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="trunktestsphpunittestscommentmetaCachephp"></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/metaCache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/metaCache.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/comment/metaCache.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'last_changed', 'comment' );
</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->assertInternalType( 'integer', add_metadata( 'comment', $comment_id, 'foo', 'bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( add_metadata( 'comment', $comment_id, 'foo', 'bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotFalse( wp_cache_get_last_changed( 'comment' ) );
</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">@@ -245,7 +245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'last_changed', 'comment' );
</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->assertInternalType( 'integer', update_metadata( 'comment', $comment_id, 'foo', 'bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( update_metadata( 'comment', $comment_id, 'foo', 'bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotFalse( wp_cache_get_last_changed( 'comment' ) );
</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="trunktestsphpunittestscommentqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/query.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/comment/query.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1713,9 +1713,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"> // Ensure we are dealing with integers, and not objects.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', $comment_1 );
- $this->assertInternalType( 'integer', $comment_2 );
- $this->assertInternalType( 'integer', $comment_3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $comment_1 );
+ $this->assertIsInt( $comment_2 );
+ $this->assertIsInt( $comment_3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = get_comments( array( 'fields' => 'ids' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 3, $comment_ids );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3331,9 +3331,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $query1->query_vars );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $query1->comments );
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = $query1->query( array( 'status' => 'all' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $query1->query_vars );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $query1->query_vars );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $query1->comments );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $query1->comments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $query1->comments );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query2 = new WP_Comment_Query( array( 'status' => 'all' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $query2->query_vars );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizecustomcsssettingphp"></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/custom-css-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/custom-css-setting.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/customize/custom-css-setting.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,10 +344,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_update_custom_css_data( $data, $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( array( 'css', 'preprocessed' ), array_keys( $data ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $data['preprocessed'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( array( 'css', 'preprocessed', 'stylesheet' ), array_keys( $args ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $args['css'], $data['css'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $args['preprocessed'], $data['preprocessed'] );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/customize/manager.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -677,9 +677,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( $expected_setting_ids, array_keys( $changeset_values ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'widget_text[2]', 'widget_meta[2]' ) as $setting_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $changeset_values[ $setting_id ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $changeset_values[ $setting_id ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $instance_data = $wp_customize->widgets->sanitize_widget_instance( $changeset_values[ $setting_id ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $instance_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $instance_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'title', $instance_data );
</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">@@ -731,7 +731,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $wp_customize->changeset_post_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1000, has_action( 'customize_register', array( $wp_customize, '_save_starter_content_changeset' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $wp_customize ); // This will trigger the changeset save.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $wp_customize->changeset_post_id() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $wp_customize->changeset_post_id() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $wp_customize->changeset_data() );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wp_customize->changeset_data() as $setting_id => $setting_params ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'starter_content', $setting_params );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -787,7 +787,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'auto-draft', get_post( $posts_by_name['waffles'] )->post_status );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( $changeset_data['blogname']['value'], get_option( 'blogname' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $r = $wp_customize->save_changeset_post( array( 'status' => 'publish' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $r );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'publish', get_post( $posts_by_name['about'] )->post_status );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'inherit', get_post( $posts_by_name['waffles'] )->post_status );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $changeset_data['blogname']['value'], get_option( 'blogname' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1041,7 +1041,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => $pre_saved_data,
</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->assertInternalType( 'array', $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $r );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $did_action['customize_save_validation_before'] + 1, did_action( 'customize_save_validation_before' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1098,7 +1098,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $r );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'transaction_fail', $r->get_error_code() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $r->get_error_data() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $r->get_error_data() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'setting_validities', $r->get_error_data() );
</span><span class="cx" style="display: block; padding: 0 10px"> $error_data = $r->get_error_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'blogname', $error_data['setting_validities'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1137,7 +1137,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->assertInternalType( 'array', $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $r );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'setting_validities', $r );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $r['setting_validities']['blogname'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $r['setting_validities']['bar_unknown'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1205,7 +1205,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->assertInternalType( 'array', $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $r );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Do it live \o/', get_option( 'blogname' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'trash', get_post_status( $post_id ) ); // Auto-trashed.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_capabilities, wp_list_pluck( $manager->settings(), 'capability' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1422,8 +1422,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_customize_changeset_save_data( $data, $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->customize_changeset_save_data_call_count += 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $data );
- $this->assertInternalType( 'array', $context );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data );
+ $this->assertIsArray( $context );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'uuid', $context );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'title', $context );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'status', $context );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1513,7 +1513,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->assertInternalType( 'array', $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $r );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> array_fill_keys( array( 'blogname', 'scratchpad', 'background_color' ), true ),
</span><span class="cx" style="display: block; padding: 0 10px"> $r['setting_validities']
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1540,7 +1540,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->assertInternalType( 'array', $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $r );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> array_fill_keys( array( 'blogname', 'background_color' ), true ),
</span><span class="cx" style="display: block; padding: 0 10px"> $r['setting_validities']
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1569,7 +1569,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => self::$subscriber_user_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">- $this->assertInternalType( 'array', $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $r );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> array_fill_keys( array( 'blogname', 'scratchpad' ), true ),
</span><span class="cx" style="display: block; padding: 0 10px"> $r['setting_validities']
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1888,7 +1888,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'autosave' => true,
</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->assertInternalType( 'array', $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $r );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify that autosave happened.
</span><span class="cx" style="display: block; padding: 0 10px"> $autosave_revision = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2715,10 +2715,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error->add( 'bad_letter', 'Bad letra', 123 );
</span><span class="cx" style="display: block; padding: 0 10px"> $error->add( 'bad_number', 'Bad number', array( 'number' => 123 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $validity = $this->manager->prepare_setting_validity_for_js( $error );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $validity );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $validity );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $error->errors as $code => $messages ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( $code, $validity );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $validity[ $code ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $validity[ $code ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( implode( ' ', $messages ), $validity[ $code ]['message'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'data', $validity[ $code ] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $validity[ $code ]['data'], $error->get_error_data( $code ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2910,7 +2910,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_customize_dynamic_setting_args_for_test_dynamic_settings( $setting_args, $setting_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $setting_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $setting_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $setting_id, array( 'foo', 'bar' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $setting_args = array( 'default' => "dynamic_{$setting_id}_default" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2927,8 +2927,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_customize_dynamic_setting_class_for_test_dynamic_settings( $setting_class, $setting_id, $setting_args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'WP_Customize_Setting', $setting_class );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $setting_id );
- $this->assertInternalType( 'array', $setting_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $setting_id );
+ $this->assertIsArray( $setting_args );
</ins><span class="cx" style="display: block; padding: 0 10px"> return $setting_class;
</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">@@ -3039,7 +3039,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_nonces() {
</span><span class="cx" style="display: block; padding: 0 10px"> $nonces = $this->manager->get_nonces();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $nonces );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $nonces );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'save', $nonces );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'preview', $nonces );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3203,10 +3203,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Components.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function return_array_containing_widgets( $components, $customize_manager ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $components );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $components );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'widgets', $components );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'nav_menus', $components );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $components );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $components );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Manager', $customize_manager );
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'widgets' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3220,10 +3220,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Components.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function return_array_containing_nav_menus( $components, $customize_manager ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $components );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $components );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'widgets', $components );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'nav_menus', $components );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $components );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $components );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Manager', $customize_manager );
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'nav_menus' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenuitemsettingphp"></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-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $setting->previous_post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $setting->update_status );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $setting->update_error );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $setting->default );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $setting->default );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $default = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -533,7 +533,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $valid_urls as $valid_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url_setting = $setting->sanitize( array( 'url' => $valid_url ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $url_setting );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $url_setting );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $valid_url, $url_setting['url'] );
</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="trunktestsphpunittestscustomizenavmenusettingphp"></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-menu-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menu-setting.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/customize/nav-menu-setting.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $setting->previous_term_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $setting->update_status );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $setting->update_error );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $setting->default );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $setting->default );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'name', 'description', 'parent' ) as $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( $key, $setting->default );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $setting->value();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'name', 'description', 'parent' ) as $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( $key, $value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menus = wp_get_nav_menus();
</span><span class="cx" style="display: block; padding: 0 10px"> $menus_ids = wp_list_pluck( $menus, 'term_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> $i = array_search( $menu_id, $menus_ids, true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $i, 'Update-previewed menu does not appear in wp_get_nav_menus()' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $i, 'Update-previewed menu does not appear in wp_get_nav_menus()' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $filtered_menu = $menus[ $i ];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Name 2 \\o/', $filtered_menu->name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menus = wp_get_nav_menus();
</span><span class="cx" style="display: block; padding: 0 10px"> $menus_ids = wp_list_pluck( $menus, 'term_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> $i = array_search( $menu_id, $menus_ids, true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $i, 'Insert-previewed menu was not injected into wp_get_nav_menus()' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $i, 'Insert-previewed menu was not injected into wp_get_nav_menus()' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $filtered_menu = $menus[ $i ];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'New Menu Name 1 \\o/', $filtered_menu->name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,8 +304,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_customize->set_post_value( $setting_id, false );
</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->assertInternalType( 'array', $setting->value() );
- $this->assertInternalType( 'object', wp_get_nav_menu_object( $menu_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $setting->value() );
+ $this->assertIsObject( wp_get_nav_menu_object( $menu_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $setting->preview();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $setting->value() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_get_nav_menu_object( $menu_id ) );
</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-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/customize/nav-menus.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,7 +381,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->assertSame( $count + 1, $this->filter_count_customize_nav_menu_searched_items );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $results );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $results );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 3, $results );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'customize_nav_menu_searched_items', array( $this, 'filter_search' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,8 +465,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Items.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_search( $items, $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $items );
- $this->assertInternalType( 'array', $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $items );
+ $this->assertIsArray( $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 's', $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'pagenum', $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->filter_count_customize_nav_menu_searched_items += 1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -804,13 +804,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->wp_customize );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = apply_filters( 'customize_dynamic_partial_args', false, 'nav_menu_instance[68b329da9893e34099c7d8ad5cb9c940]' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'nav_menu_instance', $args['type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( $this->wp_customize->nav_menus, 'render_nav_menu_partial' ), $args['render_callback'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $args['container_inclusive'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = apply_filters( 'customize_dynamic_partial_args', array( 'fallback_refresh' => false ), 'nav_menu_instance[4099c7d8ad5cb9c94068b329da9893e3]' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'nav_menu_instance', $args['type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( $this->wp_customize->nav_menus, 'render_nav_menu_partial' ), $args['render_callback'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $args['container_inclusive'] );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizepanelphp"></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/panel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/panel.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/customize/panel.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_construct_default_args() {
</span><span class="cx" style="display: block; padding: 0 10px"> $panel = new WP_Customize_Panel( $this->manager, 'foo' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $panel->instance_number );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $panel->instance_number );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->manager, $panel->manager );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', $panel->id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 160, $panel->priority );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,7 +125,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $data['content'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $data['active'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $data['instanceNumber'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $data['instanceNumber'] );
</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="trunktestsphpunittestscustomizepartialphp"></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/partial.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/partial.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/customize/partial.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_customize_partial_render( $rendered, $partial, $container_context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( false === $rendered || is_string( $rendered ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Partial', $partial );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $container_context );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $container_context );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->count_filter_customize_partial_render += 1;
</span><span class="cx" style="display: block; padding: 0 10px"> return $rendered;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( sprintf( 'customize_partial_render_%s', $partial->id ), current_filter() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( false === $rendered || is_string( $rendered ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Partial', $partial );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $container_context );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $container_context );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->count_filter_customize_partial_render_with_id += 1;
</span><span class="cx" style="display: block; padding: 0 10px"> return $rendered;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/customize/section.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_construct_default_args() {
</span><span class="cx" style="display: block; padding: 0 10px"> $section = new WP_Customize_Section( $this->manager, 'foo' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $section->instance_number );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $section->instance_number );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $this->manager, $section->manager );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', $section->id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 160, $section->priority );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $data['content'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $data['active'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $data['instanceNumber'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $data['instanceNumber'] );
</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="trunktestsphpunittestscustomizeselectiverefreshajaxphp"></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/selective-refresh-ajax.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/selective-refresh-ajax.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/customize/selective-refresh-ajax.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $output = json_decode( ob_get_clean(), true );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $output['success'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $output['data'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $output['data'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'contents', $output['data'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'errors', $output['data'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'foo', $output['data']['contents'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,7 +280,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function render_callback_blogname( $partial, $context ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $context );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $context );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Partial', $partial );
</span><span class="cx" style="display: block; padding: 0 10px"> return get_bloginfo( 'name', 'display' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +293,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function render_callback_blogdescription( $partial, $context ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $context );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $context );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Partial', $partial );
</span><span class="cx" style="display: block; padding: 0 10px"> $x = get_bloginfo( 'description', 'display' );
</span><span class="cx" style="display: block; padding: 0 10px"> return $x;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,7 +374,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Response.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_customize_render_partials_response( $response, $component, $partial_placements ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $response );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $response );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Customize_Selective_Refresh', $component );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->expected_partial_ids ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( $this->expected_partial_ids, array_keys( $partial_placements ) );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizeselectiverefreshphp"></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/selective-refresh.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/selective-refresh.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/customize/selective-refresh.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Selective_Refresh::partials()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_partials() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $this->selective_refresh->partials() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $this->selective_refresh->partials() );
</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">@@ -163,9 +163,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( (bool) preg_match( '/_customizePartialRefreshExports = ({.+})/s', $html, $matches ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $exported_data = json_decode( $matches[1], true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $exported_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $exported_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'partials', $exported_data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $exported_data['partials'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $exported_data['partials'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'blogname', $exported_data['partials'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayNotHasKey( 'top_secret_message', $exported_data['partials'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '#site-title', $exported_data['partials']['blogname']['selector'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_customize_dynamic_partial_args( $partial_args, $partial_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( false === $partial_args || is_array( $partial_args ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $partial_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $partial_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/^recognized/', $partial_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $partial_args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,9 +230,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_customize_dynamic_partial_class( $partial_class, $partial_id, $partial_args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $partial_args );
- $this->assertInternalType( 'string', $partial_id );
- $this->assertInternalType( 'string', $partial_class );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $partial_args );
+ $this->assertIsString( $partial_id );
+ $this->assertIsString( $partial_class );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'recognized-class' === $partial_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $partial_class = 'Tested_Custom_Partial';
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizesettingphp"></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/setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/setting.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/customize/setting.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -730,7 +730,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_validate_for_test_validate( $validity, $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $validity );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( sanitize_key( $value ) !== $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $validity->add( 'invalid_key', 'Invalid key' );
</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-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/customize/widgets.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +235,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->do_customize_boot_actions();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $selective_refreshable_widgets = $this->manager->widgets->get_selective_refreshable_widgets();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $selective_refreshable_widgets );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $selective_refreshable_widgets );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( count( $wp_widget_factory->widgets ), count( $selective_refreshable_widgets ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'text', $selective_refreshable_widgets );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $selective_refreshable_widgets['text'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,7 +620,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'sidebar_id', $params );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'width', $params );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'height', $params );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'bool', $params['is_wide'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsBool( $params['is_wide'] );
</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">@@ -677,7 +677,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayNotHasKey( $setting_id, $this->manager->unsanitized_post_values() );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->manager->widgets->call_widget_update( $widget_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">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'instance', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'form', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $instance, $result['instance'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -686,7 +686,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_values = $this->manager->unsanitized_post_values();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( $setting_id, $post_values );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_value = $post_values[ $setting_id ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $post_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $post_value );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'title', $post_value );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'encoded_serialized_instance', $post_value );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'instance_hash_key', $post_value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,13 +703,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'customize_register', $this->manager );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = apply_filters( 'customize_dynamic_partial_args', false, 'widget[search-2]' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'widget', $args['type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( $this->manager->widgets, 'render_widget_partial' ), $args['render_callback'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $args['container_inclusive'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = apply_filters( 'customize_dynamic_partial_args', array( 'fallback_refresh' => false ), 'widget[search-2]' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'widget', $args['type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( $this->manager->widgets, 'render_widget_partial' ), $args['render_callback'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $args['container_inclusive'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsdatecurrentTimephp"></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/currentTime.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/currentTime.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/date/currentTime.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualsWithDelta( $wp_timestamp, current_time( 'U' ), 2, 'The dates should be equal' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.DateTime.CurrentTimeTimestamp.Requested
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', current_time( 'timestamp' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( current_time( 'timestamp' ) );
</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="trunktestsphpunittestsdbphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/db.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,7 +560,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $wpdb->insert_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE ID = %d", $wpdb->insert_id ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $row );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $row );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Walter Sobchak', $row->display_name );
</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">@@ -1682,7 +1682,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $expect_bail ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $data );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list( $parsed_host, $parsed_port, $parsed_socket, $parsed_is_ipv6 ) = $data;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingSanitizePostphp"></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/SanitizePost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SanitizePost.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/formatting/SanitizePost.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,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"> foreach ( $int_fields as $field => $type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( $type, $post->$field, "field $field" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch ( $type ) {
+ case 'integer':
+ $this->assertIsInt( $post->$field, "field $field" );
+ break;
+ case 'string':
+ $this->assertIsString( $post->$field, "field $field" );
+ break;
+ }
</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="trunktestsphpunittestsfunctionslistFilesphp"></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/listFiles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/listFiles.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/functions/listFiles.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_list_files_returns_a_list_of_files() {
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_files = list_files( ABSPATH . 'wp-admin/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $admin_files );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $admin_files );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $admin_files );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( ABSPATH . 'wp-admin/index.php', $admin_files );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionswpGetMimeTypesphp"></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/wpGetMimeTypes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpGetMimeTypes.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/functions/wpGetMimeTypes.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_all_mime_match() {
</span><span class="cx" style="display: block; padding: 0 10px"> $mime_types_start = wp_get_mime_types();
</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->assertInternalType( 'array', $mime_types_start );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $mime_types_start );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $mime_types_start );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'mime_types', '__return_empty_array' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'mime_types', '__return_empty_array' );
</span><span class="cx" style="display: block; padding: 0 10px"> $mime_types = wp_get_mime_types();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $mime_types );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $mime_types );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $mime_types );
</span><span class="cx" style="display: block; padding: 0 10px"> // Did it revert to the original after filter remove?
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $mime_types_start, $mime_types );
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionswpRemoteFopenphp"></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/wpRemoteFopen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpRemoteFopen.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/functions/wpRemoteFopen.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_fopen( $url );
</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->assertInternalType( 'string', $response );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $response );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 40148, strlen( $response ) );
</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-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/functions.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,8 +80,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_parse_args_boolean_strings() {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( 'foo=false&bar=true' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $args['foo'] );
- $this->assertInternalType( 'string', $args['bar'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $args['foo'] );
+ $this->assertIsString( $args['bar'] );
</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">@@ -581,17 +581,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_allowed_mime_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> $mimes = get_allowed_mime_types();
</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->assertInternalType( 'array', $mimes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $mimes );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $mimes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'upload_mimes', '__return_empty_array' );
</span><span class="cx" style="display: block; padding: 0 10px"> $mimes = get_allowed_mime_types();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $mimes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $mimes );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $mimes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'upload_mimes', '__return_empty_array' );
</span><span class="cx" style="display: block; padding: 0 10px"> $mimes = get_allowed_mime_types();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $mimes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $mimes );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $mimes );
</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">@@ -601,28 +601,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_mime_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> $mimes = wp_get_mime_types();
</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->assertInternalType( 'array', $mimes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $mimes );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $mimes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'mime_types', '__return_empty_array' );
</span><span class="cx" style="display: block; padding: 0 10px"> $mimes = wp_get_mime_types();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $mimes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $mimes );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $mimes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'mime_types', '__return_empty_array' );
</span><span class="cx" style="display: block; padding: 0 10px"> $mimes = wp_get_mime_types();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $mimes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $mimes );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $mimes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 'upload_mimes' should not affect wp_get_mime_types().
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'upload_mimes', '__return_empty_array' );
</span><span class="cx" style="display: block; padding: 0 10px"> $mimes = wp_get_mime_types();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $mimes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $mimes );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $mimes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'upload_mimes', '__return_empty_array' );
</span><span class="cx" style="display: block; padding: 0 10px"> $mimes2 = wp_get_mime_types();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $mimes2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $mimes2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $mimes2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $mimes2, $mimes );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -910,7 +910,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $urls = wp_extract_urls( $blob );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $urls );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $urls );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $urls );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( count( $original_urls ), $urls );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_urls, $urls );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -931,7 +931,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $urls = wp_extract_urls( $blob );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $urls );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $urls );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $urls );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 8, $urls );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array_slice( $original_urls, 0, 8 ), $urls );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -945,7 +945,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $urls = wp_extract_urls( $blob );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $urls );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $urls );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $urls );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 8, $urls );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array_slice( $original_urls, 0, 8 ), $urls );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1066,7 +1066,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_get_ext_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> $extensions = wp_get_ext_types();
</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->assertInternalType( 'array', $extensions );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $extensions );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $extensions );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'ext2type', '__return_empty_array' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1075,7 +1075,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'ext2type', '__return_empty_array' );
</span><span class="cx" style="display: block; padding: 0 10px"> $extensions = wp_get_ext_types();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $extensions );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $extensions );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $extensions );
</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">@@ -1197,7 +1197,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();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_numeric( $id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $ids[] = $id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/general/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/template.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/general/template.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +304,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_set_custom_logo();
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_logo = get_custom_logo();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $custom_logo );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $custom_logo );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $custom_logo );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_remove_custom_logo();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( get_custom_logo() );
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneralwpGetArchivesphp"></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/wpGetArchives.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/wpGetArchives.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/general/wpGetArchives.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $time1 = wp_cache_get( 'last_changed', 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $time1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries + 1, $wpdb->num_queries );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'ASC',
</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->assertInternalType( 'string', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries + 1, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'ASC',
</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->assertInternalType( 'string', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries + 1, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +97,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries + 1, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries + 1, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries + 1, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestshttpbasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/http/base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/base.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/http/base.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,7 +452,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_head( $url, array( 'timeout' => 30 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skipTestOnTimeout( $res );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', wp_remote_retrieve_header( $res, 'location' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( wp_remote_retrieve_header( $res, 'location' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, wp_remote_retrieve_header( $res, 'location' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_get( $url, array( 'timeout' => 30 ) );
</span></span></pre></div>
<a id="trunktestsphpunittestshttpfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/http/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/functions.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/http/functions.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = wp_remote_retrieve_headers( $response );
</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->assertInternalType( 'array', $response );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $response );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'image/jpeg', $headers['content-type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '40148', $headers['content-length'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = wp_remote_retrieve_headers( $response );
</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->assertInternalType( 'array', $response );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $response );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Should return the same headers as a HEAD request.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'image/jpeg', $headers['content-type'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsimagefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/functions.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/image/functions.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // First, test with deprecated wp_load_image function.
</span><span class="cx" style="display: block; padding: 0 10px"> $editor1 = wp_load_image( DIR_TESTDATA );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $editor1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $editor1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor2 = wp_get_image_editor( DIR_TESTDATA );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $editor2 );
</span></span></pre></div>
<a id="trunktestsphpunittestsimageheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/header.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/image/header.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cropped_id = $this->custom_image_header->insert_attachment( $object, $cropped );
</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->assertInternalType( 'int', $cropped_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $cropped_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertGreaterThan( 0, $cropped_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsimageintermediateSizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/intermediateSize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/intermediateSize.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/image/intermediateSize.php 2021-07-05 17:21:53 UTC (rev 51331)
</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"> function test_make_intermediate_size_width() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 100, 0, false );
</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->assertInternalType( 'array', $image );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $image );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_make_intermediate_size_height() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 0, 75, false );
</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->assertInternalType( 'array', $image );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $image );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( DIR_TESTDATA . '/images/a2-small-100x75.jpg' );
</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->assertInternalType( 'array', $image );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $image );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 100, $image['width'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 75, $image['height'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'image/jpeg', $image['mime-type'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsimagesiteIconphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/siteIcon.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/siteIcon.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/image/siteIcon.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $object = $this->wp_site_icon->create_attachment_object( $cropped, $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $cropped_id = $this->wp_site_icon->insert_attachment( $object, $cropped );
</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->assertInternalType( 'int', $cropped_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $cropped_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertGreaterThan( 0, $cropped_id );
</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="trunktestsphpunittestsincludesfactoryphp"></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/includes/factory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/includes/factory.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/includes/factory.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_term_factory_create_and_get_should_return_term_object() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = self::factory()->term->create_and_get( array( 'taxonomy' => 'wptests_tax' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $term );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $term );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $term->term_id );
</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="trunktestsphpunittestsl10nphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/l10n.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_available_languages() {
</span><span class="cx" style="display: block; padding: 0 10px"> $array = get_available_languages();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $array );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $array );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $array = get_available_languages( '.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $array );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_installed_translations_for_core() {
</span><span class="cx" style="display: block; padding: 0 10px"> $installed_translations = wp_get_installed_translations( 'core' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $installed_translations );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $installed_translations );
</ins><span class="cx" style="display: block; padding: 0 10px"> $textdomains_expected = array( 'admin', 'admin-network', 'continents-cities', 'default' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( $textdomains_expected, array_keys( $installed_translations ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsmediagetAttachmentTaxonomiesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media/getAttachmentTaxonomies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media/getAttachmentTaxonomies.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/media/getAttachmentTaxonomies.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_attachment_taxonomies( $attachment, 'objects' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'wptests_tax2' ), array_keys( $found ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $found['wptests_tax2'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $found['wptests_tax2'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'wptests_tax2', $found['wptests_tax2']->name );
</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">@@ -143,7 +143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_attachment_taxonomies( $attachment, 'objects' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'wptests_tax2' ), array_keys( $found ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $found['wptests_tax2'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $found['wptests_tax2'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'wptests_tax2', $found['wptests_tax2']->name );
</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="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/media.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,7 +381,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prepped = wp_prepare_attachment_for_js( $post );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $prepped );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $prepped );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, $prepped['uploadedTo'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $prepped['mime'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $prepped['type'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1164,7 +1164,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_attachment_url_to_postid_with_empty_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = attachment_url_to_postid( '' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, $post_id );
</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="trunktestsphpunittestsmetaphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/meta.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,11 +207,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( metadata_exists( 'user', $this->author->ID, $key ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( delete_metadata( 'user', $this->author->ID, $key ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', get_metadata( 'user', $this->author->ID, $key, true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', add_metadata( 'user', $this->author->ID, $key, $value ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( add_metadata( 'user', $this->author->ID, $key, $value ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, get_metadata( 'user', $this->author->ID, $key, true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( delete_metadata( 'user', $this->author->ID, $key ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', get_metadata( 'user', $this->author->ID, $key, true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', update_metadata( 'user', $this->author->ID, $key, $value ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( update_metadata( 'user', $this->author->ID, $key, $value ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, get_metadata( 'user', $this->author->ID, $key, true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( update_metadata( 'user', $this->author->ID, $key, 'blah' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'blah', get_metadata( 'user', $this->author->ID, $key, true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,11 +220,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( metadata_exists( 'user', $this->author->ID, $key ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test overslashing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', add_metadata( 'user', $this->author->ID, $key, $value2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( add_metadata( 'user', $this->author->ID, $key, $value2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected2, get_metadata( 'user', $this->author->ID, $key, true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( delete_metadata( 'user', $this->author->ID, $key ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', get_metadata( 'user', $this->author->ID, $key, true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', update_metadata( 'user', $this->author->ID, $key, $value2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( update_metadata( 'user', $this->author->ID, $key, $value2 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected2, get_metadata( 'user', $this->author->ID, $key, 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="trunktestsphpunittestsmultisitecleanDirsizeCachephp"></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/multisite/cleanDirsizeCache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/cleanDirsizeCache.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/multisite/cleanDirsizeCache.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +206,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // `dirsize_cache` should now be filled after upload and recurse_dirsize() call.
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_path = untrailingslashit( $upload_dir['path'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', get_transient( 'dirsize_cache' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( get_transient( 'dirsize_cache' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $size, get_transient( 'dirsize_cache' )[ $cache_path ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup.
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitenetworkphp"></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/multisite/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/network.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/multisite/network.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +352,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // We can't use wp_schedule_update_network_counts() because WP_INSTALLING is set.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event( time(), 'twicedaily', 'update_network_counts' );
</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->assertInternalType( 'int', wp_next_scheduled( 'update_network_counts' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( wp_next_scheduled( 'update_network_counts' ) );
</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">@@ -365,7 +365,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create( array( 'user_id' => $user_id ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the dashboard blog to another one.
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'dashboard_blog', $blog_id );
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesitephp"></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/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/multisite/site.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), $_wp_switched_stack );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( ms_is_switched() );
</span><span class="cx" style="display: block; padding: 0 10px"> $current_blog_id = get_current_blog_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', $current_blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $current_blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'switch-test', $current_blog_id, 'switch-test' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $current_blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->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">- $this->assertInternalType( 'int', $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $prefix = $wpdb->get_blog_prefix( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // $get_all = false, only retrieve details from the blogs table.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1328,7 +1328,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> $site_id = wp_insert_site( $site_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">- $this->assertInternalType( 'integer', $site_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $site_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site = get_site( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $expected_data as $key => $value ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1434,7 +1434,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'clean_site_cache', array( $this, 'action_database_insert_on_clean_site_cache' ) );
</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->assertInternalType( 'integer', $site_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $site_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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1819,7 +1819,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'network_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">- $this->assertInternalType( 'integer', $site_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $site_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site = get_site( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualsWithDelta( strtotime( $first_date ), strtotime( $site->registered ), 2, 'The dates should be equal' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1827,7 +1827,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $second_date = current_time( 'mysql', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $site_id = wp_update_site( $site_id, array() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', $site_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $site_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site = get_site( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualsWithDelta( strtotime( $first_date ), strtotime( $site->registered ), 2, 'The dates should be equal' );
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesiteMetaphp"></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/multisite/siteMeta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/siteMeta.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/multisite/siteMeta.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,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"> $actual = update_site_meta( self::$site_id, 'foo', 'bar' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $actual );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $actual );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = get_site_meta( self::$site_id, 'foo', true );
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedcontrollerphp"></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/oembed/controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/controller.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/oembed/controller.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,8 +169,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_string( $data ) && false !== $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->fail( 'Unexpected type for $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">- $this->assertInternalType( 'string', $url );
- $this->assertInternalType( 'array', $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $url );
+ $this->assertIsArray( $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->oembed_result_filter_count++;
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +299,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_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">- $this->assertInternalType( 'array', $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $data );
</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">@@ -323,7 +323,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_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">- $this->assertInternalType( 'array', $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'version', $data );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,7 +366,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_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">- $this->assertInternalType( 'array', $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'version', $data );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,7 +411,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_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">- $this->assertInternalType( 'array', $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'version', $data );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -454,7 +454,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_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">- $this->assertInternalType( 'array', $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -603,7 +603,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'YouTube', $data->provider_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'https://i.ytimg.com/vi/' . self::YOUTUBE_VIDEO_ID . '/hqdefault.jpg', $data->thumbnail_url );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $data->width, $request['maxwidth'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -630,9 +630,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $data );
- $this->assertInternalType( 'string', $data->html );
- $this->assertInternalType( 'array', $data->scripts );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $data );
+ $this->assertIsString( $data->html );
+ $this->assertIsArray( $data->scripts );
</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_proxy_with_invalid_oembed_provider_no_discovery() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -743,7 +743,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_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">- $this->assertInternalType( 'object', $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $data );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = (array) $data;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -786,7 +786,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $this->oembed_result_filter_count );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Untrusted', $data->provider_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( self::UNTRUSTED_PROVIDER_URL, $data->provider_url );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'rich', $data->type );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -809,7 +809,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $this->oembed_result_filter_count );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $data );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringStartsWith( '<b>Unfiltered</b>', $data->html );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionmultisitephp"></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/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/multisite.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/option/multisite.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_with_another_site() {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => 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">- $this->assertInternalType( 'integer', $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__ . '_key1';
</span><span class="cx" style="display: block; padding: 0 10px"> $key2 = __FUNCTION__ . '_key2';
</span></span></pre></div>
<a id="trunktestsphpunittestspostformatsphp"></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/formats.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/formats.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/post/formats.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, 'aside' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $format = get_post_format( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,12 +20,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, 'standard' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, count( $result ) );
</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">@@ -40,7 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, 'aside' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // The format can be set but not retrieved until it is registered.
</span><span class="cx" style="display: block; padding: 0 10px"> $format = get_post_format( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,12 +53,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, 'standard' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_post_type_support( 'page', 'post-formats' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,13 +72,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, 'aside' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( has_post_format( 'aside', $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = set_post_format( $post_id, 'standard' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, count( $result ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Standard is a special case. It shows as false when set.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_post_format( 'standard', $post_id ) );
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetPageByPathphp"></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/getPageByPath.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPageByPath.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/post/getPageByPath.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,15 +306,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $page, $found->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $object = get_page_by_path( 'foo', OBJECT );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $object );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $object );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $page, $object->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $array_n = get_page_by_path( 'foo', ARRAY_N );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $array_n );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $array_n );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $page, $array_n[0] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $array_a = get_page_by_path( 'foo', ARRAY_A );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $array_a );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $array_a );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $page, $array_a['ID'] );
</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="trunktestsphpunittestspostgetPostTypeLabelsphp"></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/getPostTypeLabels.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPostTypeLabels.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/post/getPostTypeLabels.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,8 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Post_GetPostTypeLabels extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_returns_an_object() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType(
- 'object',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject(
</ins><span class="cx" style="display: block; padding: 0 10px"> get_post_type_labels(
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'foo',
</span></span></pre></div>
<a id="trunktestsphpunittestspostmetaphp"></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/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/meta.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/post/meta.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_unique_postmeta() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a unique post meta item.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'unique', 'value', true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( add_post_meta( self::$post_id, 'unique', 'value', true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check unique is enforced.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( add_post_meta( self::$post_id, 'unique', 'another value', true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,8 +69,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_nonunique_postmeta() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add two non-unique post meta items.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique', 'value' ) );
- $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique', 'another value' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( add_post_meta( self::$post_id, 'nonunique', 'value' ) );
+ $this->assertIsInt( add_post_meta( self::$post_id, 'nonunique', 'another value' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check they exist.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'value', get_post_meta( self::$post_id, 'nonunique', true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'another value' ), get_post_meta( self::$post_id, 'nonunique', false ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a third one.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique', 'someother value' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( add_post_meta( self::$post_id, 'nonunique', 'someother value' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check they exist.
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,11 +106,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_update_post_meta() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a unique post meta item.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'unique_update', 'value', true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( add_post_meta( self::$post_id, 'unique_update', 'value', true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add two non-unique post meta items.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique_update', 'value' ) );
- $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique_update', 'another value' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( add_post_meta( self::$post_id, 'nonunique_update', 'value' ) );
+ $this->assertIsInt( add_post_meta( self::$post_id, 'nonunique_update', 'another value' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check they exist.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'value', get_post_meta( self::$post_id, 'unique_update', true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,8 +133,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_delete_post_meta() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add two unique post meta items.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'unique_delete', 'value', true ) );
- $this->assertInternalType( 'integer', add_post_meta( self::$post_id_2, 'unique_delete', 'value', true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( add_post_meta( self::$post_id, 'unique_delete', 'value', true ) );
+ $this->assertIsInt( add_post_meta( self::$post_id_2, 'unique_delete', 'value', true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check they exist.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'value', get_post_meta( self::$post_id, 'unique_delete', true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,8 +150,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_delete_post_meta_by_key() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add two unique post meta items.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'unique_delete_by_key', 'value', true ) );
- $this->assertInternalType( 'integer', add_post_meta( self::$post_id_2, 'unique_delete_by_key', 'value', true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( add_post_meta( self::$post_id, 'unique_delete_by_key', 'value', true ) );
+ $this->assertIsInt( add_post_meta( self::$post_id_2, 'unique_delete_by_key', 'value', true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check they exist.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'value', get_post_meta( self::$post_id, 'unique_delete_by_key', true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_post_meta_by_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> $mid = add_post_meta( self::$post_id, 'get_post_meta_by_key', 'get_post_meta_by_key_value', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', $mid );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $mid );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mobj = new stdClass;
</span><span class="cx" style="display: block; padding: 0 10px"> $mobj->meta_id = $mid;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,7 +178,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete_metadata_by_mid( 'post', $mid );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mid = add_post_meta( self::$post_id, 'get_post_meta_by_key', array( 'foo', 'bar' ), true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', $mid );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $mid );
</ins><span class="cx" style="display: block; padding: 0 10px"> $mobj->meta_id = $mid;
</span><span class="cx" style="display: block; padding: 0 10px"> $mobj->meta_value = array( 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $mobj, get_post_meta_by_id( $mid ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_delete_meta() {
</span><span class="cx" style="display: block; padding: 0 10px"> $mid = add_post_meta( self::$post_id, 'delete_meta', 'delete_meta_value', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', $mid );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $mid );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( delete_meta( $mid ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_metadata_by_mid( 'post', $mid ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,11 +197,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_update_meta() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a unique post meta item.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', $mid1 = add_post_meta( self::$post_id, 'unique_update', 'value', true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mid1 = add_post_meta( self::$post_id, 'unique_update', 'value', true );
+ $this->assertIsInt( $mid1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add two non-unique post meta items.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', $mid2 = add_post_meta( self::$post_id, 'nonunique_update', 'value' ) );
- $this->assertInternalType( 'integer', $mid3 = add_post_meta( self::$post_id, 'nonunique_update', 'another value' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mid2 = add_post_meta( self::$post_id, 'nonunique_update', 'value' );
+ $this->assertIsInt( $mid2 );
+ $mid3 = add_post_meta( self::$post_id, 'nonunique_update', 'another value' );
+ $this->assertIsInt( $mid3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check they exist.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'value', get_post_meta( self::$post_id, 'unique_update', true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $funky_meta[] = $classy;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a post meta item.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'test_funky_post_meta', $funky_meta, true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( add_post_meta( self::$post_id, 'test_funky_post_meta', $funky_meta, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check it exists.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $funky_meta, get_post_meta( self::$post_id, 'test_funky_post_meta', true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,7 +321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'last_changed', 'posts' );
</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->assertInternalType( 'integer', add_metadata( 'post', $post_id, 'foo', 'bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( add_metadata( 'post', $post_id, 'foo', 'bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotFalse( wp_cache_get_last_changed( 'posts' ) );
</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">@@ -330,7 +333,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'last_changed', 'posts' );
</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->assertInternalType( 'integer', update_metadata( 'post', $post_id, 'foo', 'bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( update_metadata( 'post', $post_id, 'foo', 'bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotFalse( wp_cache_get_last_changed( 'posts' ) );
</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="trunktestsphpunittestspostobjectsphp"></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/objects.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/objects.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/post/objects.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,17 +30,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Excercise the output argument.
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id, ARRAY_A );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $post );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'post', $post['post_type'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id, ARRAY_N );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $post );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( isset( $post['post_type'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( in_array( 'post', $post, true ) );
</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 class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post, ARRAY_A );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $post );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'post', $post['post_type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $id, $post['ID'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure stdClass in $GLOBALS['post'] is handled.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_std = $post->to_array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $post_std );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $post_std );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_std = (object) $post_std;
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['post'] = $post_std;
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( null );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_post_ancestors_with_falsey_values() {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( null, 0, false, '0', '' ) as $post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', get_post_ancestors( $post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( get_post_ancestors( $post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), get_post_ancestors( $post_id ) );
</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">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_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">- $this->assertInternalType( 'array', $post->post_category );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $post->post_category );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, count( $post->post_category ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> $term1 = wp_insert_term( 'Foo', 'category' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,15 +131,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_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">- $this->assertInternalType( 'array', $post->tags_input );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $post->tags_input );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $post->tags_input );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_tags( $post_id, 'Foo, Bar, Baz' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $post->tags_input );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $post->tags_input );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 3, count( $post->tags_input ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'Bar', 'Baz', 'Foo' ), $post->tags_input );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id, ARRAY_A );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $post['tags_input'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $post['tags_input'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 3, count( $post['tags_input'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'Bar', 'Baz', 'Foo' ), $post['tags_input'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_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">- $this->assertInternalType( 'string', $post->page_template );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $post->page_template );
</ins><span class="cx" style="display: block; padding: 0 10px"> $template = get_post_meta( $post->ID, '_wp_page_template', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $template, $post->page_template );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_id, '_wp_page_template', 'foo.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,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->assertSame( 'raw', $post->filter );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $post->post_parent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $post->post_parent );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $display_post = get_post( $post, OBJECT, 'js' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'js', $display_post->filter );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,9 +194,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $contexts as $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id, OBJECT, $context );
</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->assertInternalType( 'int', $post->ID );
- $this->assertInternalType( 'int', $post->post_parent );
- $this->assertInternalType( 'int', $post->menu_order );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $post->ID );
+ $this->assertIsInt( $post->post_parent );
+ $this->assertIsInt( $post->menu_order );
</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">@@ -215,7 +215,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id, ARRAY_A );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $id, $post['ID'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $post['ancestors'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $post['ancestors'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'raw', $post['filter'] );
</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="trunktestsphpunittestspostqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/query.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/post/query.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,7 +737,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->assertInternalType( 'int', $q->found_posts );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $q->found_posts );
</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">@@ -756,6 +756,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'found_posts', '__return_empty_string' );
</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->assertInternalType( 'int', $q->found_posts );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $q->found_posts );
</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="trunktestsphpunittestsposttypesphp"></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/types.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/types.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/post/types.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,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->assertInternalType( 'int', array_search( 'bar', $wp->public_query_vars, true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( array_search( 'bar', $wp->public_query_vars, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( unregister_post_type( 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( array_search( 'bar', $wp->public_query_vars, true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,8 +439,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->assertInternalType( 'int', array_search( 'foo', $wp_taxonomies['category']->object_type, true ) );
- $this->assertInternalType( 'int', array_search( 'foo', $wp_taxonomies['post_tag']->object_type, true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( array_search( 'foo', $wp_taxonomies['category']->object_type, true ) );
+ $this->assertIsInt( array_search( 'foo', $wp_taxonomies['post_tag']->object_type, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( unregister_post_type( 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( array_search( 'foo', $wp_taxonomies['category']->object_type, true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( array_search( 'foo', $wp_taxonomies['post_tag']->object_type, true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,8 +499,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->assertInternalType( 'object', $wp_post_types['foo'] );
- $this->assertInternalType( 'object', get_post_type_object( 'foo' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $wp_post_types['foo'] );
+ $this->assertIsObject( get_post_type_object( 'foo' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( unregister_post_type( 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/post.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,12 +97,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_object_term_cache( $id, $post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> $tcache = wp_cache_get( $id, 'post_tag_relationships' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $tcache );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $tcache );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 2, count( $tcache ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tcache = wp_cache_get( $id, 'ctax_relationships' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'cpt' === $post_type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $tcache );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $tcache );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 2, count( $tcache ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $tcache );
</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-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/query/results.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -765,8 +765,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $children, $posts2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->q->posts as $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $post->ID );
- $this->assertInternalType( 'int', $post->post_parent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $post->ID );
+ $this->assertIsInt( $post->post_parent );
</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="trunktestsphpunittestsrestapirestattachmentscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,7 +658,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $original_image_src = wp_get_attachment_image_src( $attachment_id, 'full' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_image_size( 'rest-api-test' );
</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->assertInternalType( 'array', $data['media_details']['sizes'], 'Could not retrieve the sizes data.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data['media_details']['sizes'], 'Could not retrieve the sizes data.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $image_src[0], $data['media_details']['sizes']['rest-api-test']['source_url'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'image/jpeg', $data['media_details']['sizes']['rest-api-test']['mime_type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_image_src[0], $data['media_details']['sizes']['full']['source_url'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,7 +690,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'wp_get_attachment_image_src', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_image_size( 'rest-api-test' );
</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->assertInternalType( 'array', $data['media_details']['sizes'], 'Could not retrieve the sizes data.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data['media_details']['sizes'], 'Could not retrieve the sizes data.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( isset( $data['media_details']['sizes']['rest-api-test']['source_url'] ) );
</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="trunktestsphpunittestsrestapirestcommentscontrollerphp"></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-comments-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-comments-controller.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2903,7 +2903,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_output = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Compare expected API output to actual API output.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $actual_output['content'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $actual_output['content'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'raw', $actual_output['content'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_output['content']['raw'], $actual_output['content']['raw'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_output['content']['rendered'], trim( $actual_output['content']['rendered'] ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestpostmetafieldsphp"></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-post-meta-fields.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,7 +290,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = (array) $data['meta'];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'test_multi', $meta );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $meta['test_multi'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $meta['test_multi'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'value1', $meta['test_multi'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check after an update.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,15 +395,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = (array) $data['meta'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'test_string', $meta );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $meta['test_string'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $meta['test_string'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '42', $meta['test_string'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'test_number', $meta );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'float', $meta['test_number'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsFloat( $meta['test_number'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 42.0, $meta['test_number'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'test_bool', $meta );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'boolean', $meta['test_bool'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsBool( $meta['test_bool'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $meta['test_bool'] );
</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">@@ -1272,7 +1272,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'meta', $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $data['meta'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data['meta'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $in_post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_value = $meta_value;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1338,7 +1338,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'meta', $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $data['meta'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data['meta'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $in_post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_value = $meta_value;
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestrequestphp"></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-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-request.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/rest-api/rest-request.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,7 +491,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $valid );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $valid->get_error_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">- $this->assertInternalType( 'array', $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'params', $data );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'failparam', $data['params'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Invalid. Super Invalid. Broken.', $data['params']['failparam'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -754,7 +754,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $valid );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $valid->get_error_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">- $this->assertInternalType( 'array', $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'params', $data );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'failparam', $data['params'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Invalid. Super Invalid. Broken.', $data['params']['failparam'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestserverphp"></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-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-server.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/rest-api/rest-server.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,7 +545,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $alternate );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $alternate[0] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $alternate[1] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $alternate[1] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayNotHasKey( 'code', $alternate[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $alternate[1]['hello'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiresttermmetafieldsphp"></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-term-meta-fields.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-term-meta-fields.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/rest-api/rest-term-meta-fields.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,7 +237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = (array) $data['meta'];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'test_multi', $meta );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $meta['test_multi'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $meta['test_multi'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'value1', $meta['test_multi'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check after an update.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,15 +342,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = (array) $data['meta'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'test_string', $meta );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $meta['test_string'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $meta['test_string'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '42', $meta['test_string'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'test_number', $meta );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'float', $meta['test_number'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsFloat( $meta['test_number'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 42.0, $meta['test_number'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'test_bool', $meta );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'boolean', $meta['test_bool'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsBool( $meta['test_bool'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $meta['test_bool'] );
</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">@@ -1157,7 +1157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'meta', $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $data['meta'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data['meta'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $in_taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_value = $meta_value;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1221,7 +1221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'meta', $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $data['meta'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data['meta'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $in_taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_value = $meta_value;
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestuserscontrollerphp"></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-users-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-users-controller.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/rest-api/rest-users-controller.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1211,15 +1211,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $data['additional_errors'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data['additional_errors'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $data['additional_errors'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = $data['additional_errors'][0];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'user_name', $error['code'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Usernames can only contain lowercase letters (a-z) and numbers.', $error['message'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $data['data']['params'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data['data']['params'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors = $data['data']['params'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $errors['username'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $errors['username'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'This username is invalid because it uses illegal characters. Please enter a valid username.', $errors['username'] );
</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">@@ -1257,9 +1257,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $data['data']['params'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data['data']['params'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors = $data['data']['params'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $errors['username'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $errors['username'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Sorry, that username is not allowed.', $errors['username'] );
</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">@@ -1381,7 +1381,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertErrorResponse( 'rest_invalid_param', $switched_response, 400 );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $switched_response->get_data();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $data['additional_errors'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $data['additional_errors'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $data['additional_errors'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = $data['additional_errors'];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $errors as $error ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsrewritepermastructsphp"></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/rewrite/permastructs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/permastructs.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/rewrite/permastructs.php 2021-07-05 17:21:53 UTC (rev 51331)
</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"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_permastruct( 'foo', 'bar/%foo%' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $wp_rewrite->extra_permastructs['foo'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $wp_rewrite->extra_permastructs['foo'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '/bar/%foo%', $wp_rewrite->extra_permastructs['foo']['struct'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_permastruct( 'foo' );
</span></span></pre></div>
<a id="trunktestsphpunittestsrewritephp"></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/rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/rewrite.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,7 +482,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $rewrite_rules = get_option( 'rewrite_rules' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $rewrite_rules );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $rewrite_rules );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $rewrite_rules );
</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="trunktestsphpunitteststaxonomygetObjectTaxonomiesphp"></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/taxonomy/getObjectTaxonomies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/taxonomy/getObjectTaxonomies.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/taxonomy/getObjectTaxonomies.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_object_taxonomies( 'wptests_pt', 'objects' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'wptests_tax' ), array_keys( $found ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $found['wptests_tax'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $found['wptests_tax'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'wptests_tax', $found['wptests_tax']->name );
</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">@@ -87,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_object_taxonomies( $attachment, 'objects' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'wptests_tax2' ), array_keys( $found ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $found['wptests_tax2'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $found['wptests_tax2'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'wptests_tax2', $found['wptests_tax2']->name );
</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="trunktestsphpunitteststaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/taxonomy.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/taxonomy.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,7 +818,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post', array( 'query_var' => 'bar' ) );
</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->assertInternalType( 'int', array_search( 'bar', $wp->public_query_vars, true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( array_search( 'bar', $wp->public_query_vars, true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( unregister_taxonomy( 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( array_search( 'bar', $wp->public_query_vars, true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -840,7 +840,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->assertInternalType( 'array', $wp_rewrite->extra_permastructs['foo'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $wp_rewrite->extra_permastructs['foo'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( unregister_taxonomy( 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( isset( $wp_rewrite->extra_permastructs['foo'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -873,8 +873,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'foo', 'post' );
</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->assertInternalType( 'object', $wp_taxonomies['foo'] );
- $this->assertInternalType( 'object', get_taxonomy( 'foo' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $wp_taxonomies['foo'] );
+ $this->assertIsObject( get_taxonomy( 'foo' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( unregister_taxonomy( 'foo' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermphp"></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/getTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTerm.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/term/getTerm.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,13 +97,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_output_object() {
</span><span class="cx" style="display: block; padding: 0 10px"> $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', get_term( $t, 'wptests_tax', OBJECT ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( get_term( $t, 'wptests_tax', OBJECT ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_output_array_a() {
</span><span class="cx" style="display: block; padding: 0 10px"> $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $t, 'wptests_tax', ARRAY_A );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $term );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $term );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( isset( $term['term_id'] ) );
</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">@@ -110,16 +110,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_output_array_n() {
</span><span class="cx" style="display: block; padding: 0 10px"> $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $t, 'wptests_tax', ARRAY_N );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $term );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $term );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( isset( $term['term_id'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $term as $k => $v ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', $k );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $k );
</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="cx" style="display: block; padding: 0 10px"> public function test_output_should_fall_back_to_object_for_invalid_input() {
</span><span class="cx" style="display: block; padding: 0 10px"> $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', get_term( $t, 'wptests_tax', 'foo' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( get_term( $t, 'wptests_tax', 'foo' ) );
</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">@@ -140,11 +140,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_term( $term_data, '', OBJECT, $context );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Term', $found );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $found->term_id );
- $this->assertInternalType( 'int', $found->term_taxonomy_id );
- $this->assertInternalType( 'int', $found->parent );
- $this->assertInternalType( 'int', $found->count );
- $this->assertInternalType( 'int', $found->term_group );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $found->term_id );
+ $this->assertIsInt( $found->term_taxonomy_id );
+ $this->assertIsInt( $found->parent );
+ $this->assertIsInt( $found->count );
+ $this->assertIsInt( $found->term_group );
</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="trunktestsphpunitteststermgetTermsphp"></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/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTerms.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/term/getTerms.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -861,7 +861,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $term['term_id'], 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $term->term_id, $term->parent );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', get_term_children( $term->term_id, 'category' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( get_term_children( $term->term_id, 'category' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTheTermsphp"></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/getTheTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTheTerms.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/term/getTheTerms.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // get_the_terms() does prime the cache.
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_the_terms( $post_id, $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> $cache = wp_cache_get( $post_id, $this->taxonomy . '_relationships' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $cache );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $cache );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cache should be empty after a set.
</span><span class="cx" style="display: block; padding: 0 10px"> $tt_2 = wp_set_object_terms( $post_id, $terms_2, $this->taxonomy );
</span></span></pre></div>
<a id="trunktestsphpunitteststermmetaphp"></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/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/meta.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/term/meta.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = update_term_meta( $t, 'foo', 'bar' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $actual );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $actual );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = get_term_meta( $t, 'foo', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -549,7 +549,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'last_changed', 'terms' );
</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->assertInternalType( 'integer', add_metadata( 'term', $term_id, 'foo', 'bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( add_metadata( 'term', $term_id, 'foo', 'bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotFalse( wp_cache_get_last_changed( 'terms' ) );
</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">@@ -561,7 +561,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'last_changed', 'terms' );
</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->assertInternalType( 'integer', update_metadata( 'term', $term_id, 'foo', 'bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( update_metadata( 'term', $term_id, 'foo', 'bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotFalse( wp_cache_get_last_changed( 'terms' ) );
</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="trunktestsphpunitteststermtermExistsphp"></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/termExists.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/termExists.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/term/termExists.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_taxonomy( 'foo' );
</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->assertInternalType( 'array', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $found );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $t, $found['term_id'] );
</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">@@ -180,7 +180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_taxonomy( 'foo' );
</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->assertInternalType( 'array', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $found );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $t, $found['term_id'] );
</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">@@ -198,7 +198,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_taxonomy( 'foo' );
</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->assertInternalType( 'array', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $found );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $t, $found['term_id'] );
</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">@@ -216,7 +216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_taxonomy( 'foo' );
</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->assertInternalType( 'array', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $found );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $t, $found['term_id'] );
</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">@@ -234,7 +234,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_taxonomy( 'foo' );
</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->assertInternalType( 'string', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $found );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $t, $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">@@ -252,7 +252,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_taxonomy( 'foo' );
</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->assertInternalType( 'string', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $found );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $t, $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">@@ -262,7 +262,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Insert a term.
</span><span class="cx" style="display: block; padding: 0 10px"> $term = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $t = wp_insert_term( $term, 'wptests_tax' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $t );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $t );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $t['term_id'], term_exists( $t['term_id'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $t['term_id'], term_exists( $term ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</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-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/term/wpGenerateTagCloud.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,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->assertInternalType( 'array', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $found );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '>' . $tags[0]->name . '<', $found[0] );
</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="trunktestsphpunitteststermwpGetObjectTermsphp"></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/wpGetObjectTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpGetObjectTerms.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/term/wpGetObjectTerms.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,12 +73,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term = array_shift( $terms );
</span><span class="cx" style="display: block; padding: 0 10px"> $int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $int_fields as $field ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $term->$field, $field );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $term->$field, $field );
</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"> $terms = wp_get_object_terms( $post_id, $this->taxonomy, array( 'fields' => 'ids' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = array_shift( $terms );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $term, 'term' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $term, 'term' );
</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">@@ -93,7 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = wp_get_object_terms( $post_id, $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'wp_get_object_terms', array( $this, 'filter_get_object_terms' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $term );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $term );
</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="trunktestsphpunitteststermwpInsertTermphp"></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/wpInsertTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpInsertTerm.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/term/wpInsertTerm.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $initial_count = wp_count_terms( array( 'taxonomy' => $taxonomy ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $t = wp_insert_term( $term, $taxonomy );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $t );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $t );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $t );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $t['term_id'] > 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $t['term_taxonomy_id'] > 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -776,7 +776,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_taxonomy( 'wptests_tax' );
</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->assertInternalType( 'array', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $found );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $found['term_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $found['term_taxonomy_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $term_by_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -844,8 +844,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->assertInternalType( 'int', $t1 );
- $this->assertInternalType( 'int', $t2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $t1 );
+ $this->assertIsInt( $t2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( $t1, $t2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_2 = get_term( $t2, 'wptests_tax' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -900,10 +900,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** Helpers */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function deleted_term_cb( $term, $tt_id, $taxonomy, $deleted_term, $object_ids ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'object', $deleted_term );
- $this->assertInternalType( 'int', $term );
- $this->assertInternalType( 'array', $object_ids );
- // Pesky string $this->assertInternalType( 'int', $tt_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsObject( $deleted_term );
+ $this->assertIsInt( $term );
+ $this->assertIsArray( $object_ids );
+ // Pesky string $this->assertIsInt( $tt_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $term, $deleted_term->term_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $taxonomy, $deleted_term->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $tt_id, $deleted_term->term_taxonomy_id );
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpSetObjectTermsphp"></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/wpSetObjectTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpSetObjectTerms.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/term/wpSetObjectTerms.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 3; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term = "term_{$i}";
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wp_insert_term( $term, $this->taxonomy );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id[ $term ] = $result['term_id'];
</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">@@ -254,7 +254,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 3; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term = "term_{$i}";
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wp_insert_term( $term, $this->taxonomy );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms_1[ $i ] = $result['term_id'];
</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="trunktestsphpunitteststermwpUpdateTermphp"></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/wpUpdateTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpUpdateTerm.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/term/wpUpdateTerm.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -612,7 +612,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_taxonomy( 'wptests_tax' );
</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->assertInternalType( 'array', $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $found );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $found['term_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $found['term_taxonomy_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $term_by_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,8 +638,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->assertInternalType( 'int', $found['term_id'] );
- $this->assertInternalType( 'int', $found['term_taxonomy_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $found['term_id'] );
+ $this->assertIsInt( $found['term_taxonomy_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"> public function test_wp_update_term_should_clean_term_cache() {
</span></span></pre></div>
<a id="trunktestsphpunitteststermphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/term.php 2021-07-05 17:21:53 UTC (rev 51331)
</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"> // Insert a term.
</span><span class="cx" style="display: block; padding: 0 10px"> $term = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $t = wp_insert_term( $term, $this->taxonomy );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $t );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $t );
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_obj = get_term_by( 'name', $term, $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $t['term_id'], term_exists( $term_obj->slug ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,9 +132,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term2 = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $t = wp_insert_term( $term, 'category' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $t );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $t );
</ins><span class="cx" style="display: block; padding: 0 10px"> $t2 = wp_insert_term( $term, 'category', array( 'parent' => $t['term_id'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $t2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $t2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'term_is_ancestor_of' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( term_is_ancestor_of( $t['term_id'], $t2['term_id'], 'category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( term_is_ancestor_of( $t2['term_id'], $t['term_id'], 'category' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,7 +176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::$post_ids[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_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">- $this->assertInternalType( 'array', $post->post_category );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $post->post_category );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, count( $post->post_category ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitteststhemegetThemeStarterContentphp"></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/theme/getThemeStarterContent.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/getThemeStarterContent.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/theme/getThemeStarterContent.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,10 +142,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $dehydrated_starter_content['attachments']['featured-image-logo'], $hydrated_starter_content['attachments']['featured-image-logo'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $hydrated_starter_content['widgets']['sidebar-1'] as $widget ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $widget );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $widget );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $widget );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $widget[0] );
- $this->assertInternalType( 'array', $widget[1] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $widget[0] );
+ $this->assertIsArray( $widget[1] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'title', $widget[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'text', $hydrated_starter_content['widgets']['sidebar-1'][1][0], 'Core content extended' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,15 +152,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Our Story', $hydrated_starter_content['widgets']['sidebar-1'][1][1]['title'], 'Core content extended' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $hydrated_starter_content['nav_menus']['top']['items'] as $nav_menu_item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $nav_menu_item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $nav_menu_item );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( ! empty( $nav_menu_item['object_id'] ) || ! empty( $nav_menu_item['url'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Email Us', $hydrated_starter_content['nav_menus']['top']['items'][4]['title'], 'Core content extended' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $hydrated_starter_content['posts'] as $key => $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $key );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $key );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_numeric( $key ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $post );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'post_type', $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'post_title', $post );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Filtered starter content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_theme_starter_content( $content, $config ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $config );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $config );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $config['widgets']['sidebar-1'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $content['widgets']['sidebar-1'][] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'text',
</span></span></pre></div>
<a id="trunktestsphpunittestsusermultisitephp"></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/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/multisite.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/user/multisite.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create( array( 'user_id' => get_current_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">- $this->assertInternalType( 'int', $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_blog_user( $blog_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( remove_user_from_blog( $user1_id, $blog_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_blog_user( $blog_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create( array( 'user_id' => get_current_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">- $this->assertInternalType( 'int', $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Current user gets added to new blogs.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_user_member_of_blog( $user1_id, $blog_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 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/user.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user->filter = $context;
</span><span class="cx" style="display: block; padding: 0 10px"> $user->init( $user->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">- $this->assertInternalType( 'int', $user->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $user->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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -870,7 +870,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->assertInternalType( 'int', $u );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $u );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertGreaterThan( 0, $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $u );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1493,7 +1493,7 @@
</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="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_User', $user );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'nickname1', $user->nickname );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1504,7 +1504,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'nickname_updated', $user->nickname );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check not to change an old password if a new password contains only spaces. Ticket #42766.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1516,7 +1516,7 @@
</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"> $user = get_user_by( 'ID', $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">- $this->assertInternalType( 'int', $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $old_pass, $user->user_pass );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check updating user with missing second password.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1535,7 +1535,7 @@
</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"> remove_action( 'check_passwords', array( $this, 'action_check_passwords_blank_password' ) );
</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->assertInternalType( 'int', $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'nickname_updated2', $user->nickname );
</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="trunktestsphpunittestswidgetsmediawidgetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/widgets/media-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/media-widget.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/widgets/media-widget.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,7 +219,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->filter_instance_schema_args = null;
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'widget_mocked_instance_schema', array( $this, 'filter_instance_schema' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = $widget->get_instance_schema();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $this->filter_instance_schema_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $this->filter_instance_schema_args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $widget, $this->filter_instance_schema_args['widget'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( array( 'attachment_id', 'title', 'url' ), array_keys( $this->filter_instance_schema_args['schema'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'injected', $schema );
</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-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/widgets.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -624,7 +624,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $option_value['_multiwidget'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 2, $option_value );
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = $option_value[2];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $instance );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $instance );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'content', $instance );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $option_value['_multiwidget'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -875,11 +875,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = retrieve_widgets( 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->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $sidebars_widgets );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sidebars_widgets as $widgets ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $widgets );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $widgets );
</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"> $this->assertContains( 'tag_cloud-1', $sidebars_widgets['sidebar-1'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -924,11 +924,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = retrieve_widgets( true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // $sidebars_widgets matches registered sidebars.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $sidebars_widgets );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sidebars_widgets as $widgets ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $widgets );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $widgets );
</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"> $this->assertContains( 'tag_cloud-1', $sidebars_widgets['sidebar-1'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -963,11 +963,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = retrieve_widgets( true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_sidebars_widgets = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $sidebars_widgets );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sidebars_widgets as $widgets ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $widgets );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $widgets );
</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"> // Current theme doesn't have a fantasy-sidebar.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1005,11 +1005,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = retrieve_widgets();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_sidebars_widgets = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $sidebars_widgets );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sidebars_widgets as $widgets ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $widgets );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $widgets );
</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"> // This sidebar is not registered anymore.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1056,11 +1056,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = retrieve_widgets( 'customize' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_sidebars_widgets = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $result, $sidebars_widgets );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sidebars_widgets as $widgets ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $widgets );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $widgets );
</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"> $this->assertContains( 'tag_cloud-1', $sidebars_widgets['sidebar-1'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1124,10 +1124,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> retrieve_widgets();
</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->assertInternalType( 'array', $sidebars_widgets );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $sidebars_widgets );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sidebars_widgets as $widgets ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $widgets );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $widgets );
</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"> // 5 default widgets + 1 orphaned calendar widget = 6.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1157,12 +1157,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $filtered_widgets = _wp_remove_unregistered_widgets( $widgets, $allowed_widgets );
</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->assertInternalType( 'array', $filtered_widgets );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $filtered_widgets );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'fantasy', $filtered_widgets );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $filtered_widgets['fantasy'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'array_version', $filtered_widgets );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 3, $filtered_widgets['array_version'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'integer', $filtered_widgets['array_version'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $filtered_widgets['array_version'] );
</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="trunktestsphpunittestsxmlrpcmwgetPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,27 +52,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check data types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['userid'] );
- $this->assertInternalType( 'int', $result['postid'] );
- $this->assertInternalType( 'string', $result['description'] );
- $this->assertInternalType( 'string', $result['title'] );
- $this->assertInternalType( 'string', $result['link'] );
- $this->assertInternalType( 'string', $result['permaLink'] );
- $this->assertInternalType( 'array', $result['categories'] );
- $this->assertInternalType( 'string', $result['mt_excerpt'] );
- $this->assertInternalType( 'string', $result['mt_text_more'] );
- $this->assertInternalType( 'string', $result['wp_more_text'] );
- $this->assertInternalType( 'int', $result['mt_allow_comments'] );
- $this->assertInternalType( 'int', $result['mt_allow_pings'] );
- $this->assertInternalType( 'string', $result['mt_keywords'] );
- $this->assertInternalType( 'string', $result['wp_slug'] );
- $this->assertInternalType( 'string', $result['wp_password'] );
- $this->assertInternalType( 'string', $result['wp_author_id'] );
- $this->assertInternalType( 'string', $result['wp_author_display_name'] );
- $this->assertInternalType( 'string', $result['post_status'] );
- $this->assertInternalType( 'array', $result['custom_fields'] );
- $this->assertInternalType( 'string', $result['wp_post_format'] );
- $this->assertInternalType( 'bool', $result['sticky'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['userid'] );
+ $this->assertIsInt( $result['postid'] );
+ $this->assertIsString( $result['description'] );
+ $this->assertIsString( $result['title'] );
+ $this->assertIsString( $result['link'] );
+ $this->assertIsString( $result['permaLink'] );
+ $this->assertIsArray( $result['categories'] );
+ $this->assertIsString( $result['mt_excerpt'] );
+ $this->assertIsString( $result['mt_text_more'] );
+ $this->assertIsString( $result['wp_more_text'] );
+ $this->assertIsInt( $result['mt_allow_comments'] );
+ $this->assertIsInt( $result['mt_allow_pings'] );
+ $this->assertIsString( $result['mt_keywords'] );
+ $this->assertIsString( $result['wp_slug'] );
+ $this->assertIsString( $result['wp_password'] );
+ $this->assertIsString( $result['wp_author_id'] );
+ $this->assertIsString( $result['wp_author_display_name'] );
+ $this->assertIsString( $result['post_status'] );
+ $this->assertIsArray( $result['custom_fields'] );
+ $this->assertIsString( $result['wp_post_format'] );
+ $this->assertIsBool( $result['sticky'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data = get_post( self::$post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> $result = $this->myxmlrpcserver->mw_getPost( array( self::$post_id, 'author', 'author' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</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->assertInternalType( 'int', $result['wp_post_thumbnail'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $result['wp_post_thumbnail'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $attachment_id, $result['wp_post_thumbnail'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_support( 'post-thumbnails' );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcmwgetRecentPostsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,26 +58,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $result['postid'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check data types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['userid'] );
- $this->assertInternalType( 'string', $result['postid'] );
- $this->assertInternalType( 'string', $result['description'] );
- $this->assertInternalType( 'string', $result['title'] );
- $this->assertInternalType( 'string', $result['link'] );
- $this->assertInternalType( 'string', $result['permaLink'] );
- $this->assertInternalType( 'array', $result['categories'] );
- $this->assertInternalType( 'string', $result['mt_excerpt'] );
- $this->assertInternalType( 'string', $result['mt_text_more'] );
- $this->assertInternalType( 'string', $result['wp_more_text'] );
- $this->assertInternalType( 'int', $result['mt_allow_comments'] );
- $this->assertInternalType( 'int', $result['mt_allow_pings'] );
- $this->assertInternalType( 'string', $result['mt_keywords'] );
- $this->assertInternalType( 'string', $result['wp_slug'] );
- $this->assertInternalType( 'string', $result['wp_password'] );
- $this->assertInternalType( 'string', $result['wp_author_id'] );
- $this->assertInternalType( 'string', $result['wp_author_display_name'] );
- $this->assertInternalType( 'string', $result['post_status'] );
- $this->assertInternalType( 'array', $result['custom_fields'] );
- $this->assertInternalType( 'string', $result['wp_post_format'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['userid'] );
+ $this->assertIsString( $result['postid'] );
+ $this->assertIsString( $result['description'] );
+ $this->assertIsString( $result['title'] );
+ $this->assertIsString( $result['link'] );
+ $this->assertIsString( $result['permaLink'] );
+ $this->assertIsArray( $result['categories'] );
+ $this->assertIsString( $result['mt_excerpt'] );
+ $this->assertIsString( $result['mt_text_more'] );
+ $this->assertIsString( $result['wp_more_text'] );
+ $this->assertIsInt( $result['mt_allow_comments'] );
+ $this->assertIsInt( $result['mt_allow_pings'] );
+ $this->assertIsString( $result['mt_keywords'] );
+ $this->assertIsString( $result['wp_slug'] );
+ $this->assertIsString( $result['wp_password'] );
+ $this->assertIsString( $result['wp_author_id'] );
+ $this->assertIsString( $result['wp_author_display_name'] );
+ $this->assertIsString( $result['post_status'] );
+ $this->assertIsArray( $result['custom_fields'] );
+ $this->assertIsString( $result['wp_post_format'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check expected values.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringMatchesFormat( '%d', $result['userid'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $results );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $results as $result ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['wp_post_thumbnail'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['wp_post_thumbnail'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringMatchesFormat( '%d', $result['wp_post_thumbnail'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $result['wp_post_thumbnail'] ) || $result['postid'] === self::$post_id ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpdeleteTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,6 +70,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_deleteTerm( array( 1, 'editor', 'editor', 'category', self::$term_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'boolean', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsBool( $result );
</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="trunktestsphpunittestsxmlrpcwpeditPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPost( array( 1, 'author', 'author', $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'post_thumbnail', $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result['post_thumbnail'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result['post_thumbnail'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $attachment_id, $result['post_thumbnail']['attachment_id'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Edit the post without supplying a post_thumbnail and check that it didn't change.
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpeditTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,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->assertNotIXRError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'boolean', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsBool( $result );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( self::$child_term, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $term->parent );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'editor', 'editor', self::$child_term, $fields ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'boolean', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsBool( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getComment.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getComment.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,20 +54,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check data types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['user_id'] );
- $this->assertInternalType( 'string', $result['comment_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['user_id'] );
+ $this->assertIsString( $result['comment_id'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Date', $result['date_created_gmt'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['parent'] );
- $this->assertInternalType( 'string', $result['status'] );
- $this->assertInternalType( 'string', $result['content'] );
- $this->assertInternalType( 'string', $result['link'] );
- $this->assertInternalType( 'string', $result['post_id'] );
- $this->assertInternalType( 'string', $result['post_title'] );
- $this->assertInternalType( 'string', $result['author'] );
- $this->assertInternalType( 'string', $result['author_url'] );
- $this->assertInternalType( 'string', $result['author_email'] );
- $this->assertInternalType( 'string', $result['author_ip'] );
- $this->assertInternalType( 'string', $result['type'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['parent'] );
+ $this->assertIsString( $result['status'] );
+ $this->assertIsString( $result['content'] );
+ $this->assertIsString( $result['link'] );
+ $this->assertIsString( $result['post_id'] );
+ $this->assertIsString( $result['post_title'] );
+ $this->assertIsString( $result['author'] );
+ $this->assertIsString( $result['author_url'] );
+ $this->assertIsString( $result['author_email'] );
+ $this->assertIsString( $result['author_ip'] );
+ $this->assertIsString( $result['type'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check expected values.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringMatchesFormat( '%d', $result['user_id'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetCommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,7 +198,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->assertInternalType( 'array', $result2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $result2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result3 = $this->myxmlrpcserver->wp_getComments(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +225,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->assertInternalType( 'array', $result4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $result4 );
</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">@@ -276,7 +276,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->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result2 = $this->myxmlrpcserver->wp_getComments(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,7 +291,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->assertInternalType( 'array', $result2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $result2 );
</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="trunktestsphpunittestsxmlrpcwpgetMediaItemphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,15 +50,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check data types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['attachment_id'] );
- $this->assertInternalType( 'int', $result['parent'] );
- $this->assertInternalType( 'string', $result['title'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['attachment_id'] );
+ $this->assertIsInt( $result['parent'] );
+ $this->assertIsString( $result['title'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Date', $result['date_created_gmt'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['caption'] );
- $this->assertInternalType( 'string', $result['description'] );
- $this->assertInternalType( 'string', $result['link'] );
- $this->assertInternalType( 'string', $result['thumbnail'] );
- $this->assertInternalType( 'array', $result['metadata'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['caption'] );
+ $this->assertIsString( $result['description'] );
+ $this->assertIsString( $result['link'] );
+ $this->assertIsString( $result['thumbnail'] );
+ $this->assertIsArray( $result['metadata'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check expected values.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringMatchesFormat( '%d', $result['attachment_id'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetOptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getOptions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getOptions.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getOptions.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'subscriber', 'subscriber' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'WordPress', $result['software_name']['value'] );
</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">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'administrator', 'administrator', 'default_comment_status' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_option( 'default_comment_status' ), $result['default_comment_status']['value'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $result['default_comment_status']['readonly'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'subscriber', 'subscriber' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Read-only options.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'WordPress', $result['software_name']['value'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'administrator', 'administrator' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Read-only options.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'WordPress', $result['software_name']['value'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getPage.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPage.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPage.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,28 +46,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check data types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['userid'] );
- $this->assertInternalType( 'int', $result['page_id'] );
- $this->assertInternalType( 'string', $result['page_status'] );
- $this->assertInternalType( 'string', $result['description'] );
- $this->assertInternalType( 'string', $result['title'] );
- $this->assertInternalType( 'string', $result['link'] );
- $this->assertInternalType( 'string', $result['permaLink'] );
- $this->assertInternalType( 'array', $result['categories'] );
- $this->assertInternalType( 'string', $result['excerpt'] );
- $this->assertInternalType( 'string', $result['text_more'] );
- $this->assertInternalType( 'int', $result['mt_allow_comments'] );
- $this->assertInternalType( 'int', $result['mt_allow_pings'] );
- $this->assertInternalType( 'string', $result['wp_slug'] );
- $this->assertInternalType( 'string', $result['wp_password'] );
- $this->assertInternalType( 'string', $result['wp_author'] );
- $this->assertInternalType( 'int', $result['wp_page_parent_id'] );
- $this->assertInternalType( 'string', $result['wp_page_parent_title'] );
- $this->assertInternalType( 'int', $result['wp_page_order'] );
- $this->assertInternalType( 'string', $result['wp_author_id'] );
- $this->assertInternalType( 'string', $result['wp_author_display_name'] );
- $this->assertInternalType( 'array', $result['custom_fields'] );
- $this->assertInternalType( 'string', $result['wp_page_template'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['userid'] );
+ $this->assertIsInt( $result['page_id'] );
+ $this->assertIsString( $result['page_status'] );
+ $this->assertIsString( $result['description'] );
+ $this->assertIsString( $result['title'] );
+ $this->assertIsString( $result['link'] );
+ $this->assertIsString( $result['permaLink'] );
+ $this->assertIsArray( $result['categories'] );
+ $this->assertIsString( $result['excerpt'] );
+ $this->assertIsString( $result['text_more'] );
+ $this->assertIsInt( $result['mt_allow_comments'] );
+ $this->assertIsInt( $result['mt_allow_pings'] );
+ $this->assertIsString( $result['wp_slug'] );
+ $this->assertIsString( $result['wp_password'] );
+ $this->assertIsString( $result['wp_author'] );
+ $this->assertIsInt( $result['wp_page_parent_id'] );
+ $this->assertIsString( $result['wp_page_parent_title'] );
+ $this->assertIsInt( $result['wp_page_order'] );
+ $this->assertIsString( $result['wp_author_id'] );
+ $this->assertIsString( $result['wp_author_display_name'] );
+ $this->assertIsArray( $result['custom_fields'] );
+ $this->assertIsString( $result['wp_page_template'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data = get_post( self::$post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPost.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,26 +42,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check data types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['post_id'] );
- $this->assertInternalType( 'string', $result['post_title'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['post_id'] );
+ $this->assertIsString( $result['post_title'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Date', $result['post_date'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Date', $result['post_date_gmt'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Date', $result['post_modified'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Date', $result['post_modified_gmt'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['post_status'] );
- $this->assertInternalType( 'string', $result['post_type'] );
- $this->assertInternalType( 'string', $result['post_name'] );
- $this->assertInternalType( 'string', $result['post_author'] );
- $this->assertInternalType( 'string', $result['post_password'] );
- $this->assertInternalType( 'string', $result['post_excerpt'] );
- $this->assertInternalType( 'string', $result['post_content'] );
- $this->assertInternalType( 'string', $result['link'] );
- $this->assertInternalType( 'string', $result['comment_status'] );
- $this->assertInternalType( 'string', $result['ping_status'] );
- $this->assertInternalType( 'bool', $result['sticky'] );
- $this->assertInternalType( 'string', $result['post_format'] );
- $this->assertInternalType( 'array', $result['post_thumbnail'] );
- $this->assertInternalType( 'array', $result['custom_fields'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['post_status'] );
+ $this->assertIsString( $result['post_type'] );
+ $this->assertIsString( $result['post_name'] );
+ $this->assertIsString( $result['post_author'] );
+ $this->assertIsString( $result['post_password'] );
+ $this->assertIsString( $result['post_excerpt'] );
+ $this->assertIsString( $result['post_content'] );
+ $this->assertIsString( $result['link'] );
+ $this->assertIsString( $result['comment_status'] );
+ $this->assertIsString( $result['ping_status'] );
+ $this->assertIsBool( $result['sticky'] );
+ $this->assertIsString( $result['post_format'] );
+ $this->assertIsArray( $result['post_thumbnail'] );
+ $this->assertIsArray( $result['custom_fields'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check expected values.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringMatchesFormat( '%d', $result['post_id'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,11 +137,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPost( array( 1, 'editor', 'editor', $child_page_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</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->assertInternalType( 'string', $result['post_id'] );
- $this->assertInternalType( 'string', $result['post_parent'] );
- $this->assertInternalType( 'int', $result['menu_order'] );
- $this->assertInternalType( 'string', $result['guid'] );
- $this->assertInternalType( 'string', $result['post_mime_type'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['post_id'] );
+ $this->assertIsString( $result['post_parent'] );
+ $this->assertIsInt( $result['menu_order'] );
+ $this->assertIsString( $result['guid'] );
+ $this->assertIsString( $result['post_mime_type'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'page', $result['post_type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $parent_page_id, $result['post_parent'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPostTypephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getPostType.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPostType.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPostType.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,62 +59,62 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check data types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['name'] );
- $this->assertInternalType( 'string', $result['label'] );
- $this->assertInternalType( 'bool', $result['hierarchical'] );
- $this->assertInternalType( 'bool', $result['public'] );
- $this->assertInternalType( 'bool', $result['_builtin'] );
- $this->assertInternalType( 'bool', $result['map_meta_cap'] );
- $this->assertInternalType( 'bool', $result['has_archive'] );
- $this->assertInternalType( 'bool', $result['show_ui'] );
- $this->assertInternalType( 'int', $result['menu_position'] );
- $this->assertInternalType( 'string', $result['menu_icon'] );
- $this->assertInternalType( 'array', $result['labels'] );
- $this->assertInternalType( 'array', $result['cap'] );
- $this->assertInternalType( 'array', $result['taxonomies'] );
- $this->assertInternalType( 'array', $result['supports'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['name'] );
+ $this->assertIsString( $result['label'] );
+ $this->assertIsBool( $result['hierarchical'] );
+ $this->assertIsBool( $result['public'] );
+ $this->assertIsBool( $result['_builtin'] );
+ $this->assertIsBool( $result['map_meta_cap'] );
+ $this->assertIsBool( $result['has_archive'] );
+ $this->assertIsBool( $result['show_ui'] );
+ $this->assertIsInt( $result['menu_position'] );
+ $this->assertIsString( $result['menu_icon'] );
+ $this->assertIsArray( $result['labels'] );
+ $this->assertIsArray( $result['cap'] );
+ $this->assertIsArray( $result['taxonomies'] );
+ $this->assertIsArray( $result['supports'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check label data types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['labels']['name'] );
- $this->assertInternalType( 'string', $result['labels']['singular_name'] );
- $this->assertInternalType( 'string', $result['labels']['add_new'] );
- $this->assertInternalType( 'string', $result['labels']['add_new_item'] );
- $this->assertInternalType( 'string', $result['labels']['edit_item'] );
- $this->assertInternalType( 'string', $result['labels']['new_item'] );
- $this->assertInternalType( 'string', $result['labels']['view_item'] );
- $this->assertInternalType( 'string', $result['labels']['search_items'] );
- $this->assertInternalType( 'string', $result['labels']['not_found'] );
- $this->assertInternalType( 'string', $result['labels']['not_found_in_trash'] );
- $this->assertInternalType( 'string', $result['labels']['parent_item_colon'] );
- $this->assertInternalType( 'string', $result['labels']['all_items'] );
- $this->assertInternalType( 'string', $result['labels']['menu_name'] );
- $this->assertInternalType( 'string', $result['labels']['name_admin_bar'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['labels']['name'] );
+ $this->assertIsString( $result['labels']['singular_name'] );
+ $this->assertIsString( $result['labels']['add_new'] );
+ $this->assertIsString( $result['labels']['add_new_item'] );
+ $this->assertIsString( $result['labels']['edit_item'] );
+ $this->assertIsString( $result['labels']['new_item'] );
+ $this->assertIsString( $result['labels']['view_item'] );
+ $this->assertIsString( $result['labels']['search_items'] );
+ $this->assertIsString( $result['labels']['not_found'] );
+ $this->assertIsString( $result['labels']['not_found_in_trash'] );
+ $this->assertIsString( $result['labels']['parent_item_colon'] );
+ $this->assertIsString( $result['labels']['all_items'] );
+ $this->assertIsString( $result['labels']['menu_name'] );
+ $this->assertIsString( $result['labels']['name_admin_bar'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check cap data types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['cap']['edit_post'] );
- $this->assertInternalType( 'string', $result['cap']['read_post'] );
- $this->assertInternalType( 'string', $result['cap']['delete_post'] );
- $this->assertInternalType( 'string', $result['cap']['edit_posts'] );
- $this->assertInternalType( 'string', $result['cap']['edit_others_posts'] );
- $this->assertInternalType( 'string', $result['cap']['publish_posts'] );
- $this->assertInternalType( 'string', $result['cap']['read_private_posts'] );
- $this->assertInternalType( 'string', $result['cap']['read'] );
- $this->assertInternalType( 'string', $result['cap']['delete_posts'] );
- $this->assertInternalType( 'string', $result['cap']['delete_private_posts'] );
- $this->assertInternalType( 'string', $result['cap']['delete_published_posts'] );
- $this->assertInternalType( 'string', $result['cap']['delete_others_posts'] );
- $this->assertInternalType( 'string', $result['cap']['edit_private_posts'] );
- $this->assertInternalType( 'string', $result['cap']['edit_published_posts'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['cap']['edit_post'] );
+ $this->assertIsString( $result['cap']['read_post'] );
+ $this->assertIsString( $result['cap']['delete_post'] );
+ $this->assertIsString( $result['cap']['edit_posts'] );
+ $this->assertIsString( $result['cap']['edit_others_posts'] );
+ $this->assertIsString( $result['cap']['publish_posts'] );
+ $this->assertIsString( $result['cap']['read_private_posts'] );
+ $this->assertIsString( $result['cap']['read'] );
+ $this->assertIsString( $result['cap']['delete_posts'] );
+ $this->assertIsString( $result['cap']['delete_private_posts'] );
+ $this->assertIsString( $result['cap']['delete_published_posts'] );
+ $this->assertIsString( $result['cap']['delete_others_posts'] );
+ $this->assertIsString( $result['cap']['edit_private_posts'] );
+ $this->assertIsString( $result['cap']['edit_published_posts'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check taxonomy data types.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $result['taxonomies'] as $taxonomy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $taxonomy );
</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"> // Check support data types.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $result['supports'] as $key => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $key );
- $this->assertInternalType( 'bool', $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $key );
+ $this->assertIsBool( $value );
</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"> // Check expected values.
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPostTypesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getPostTypes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPostTypes.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPostTypes.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPostTypes( array( 1, 'subscriber', 'subscriber' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, count( $result ) );
</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">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPostTypes( array( 1, 'editor', 'editor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertGreaterThan( 0, count( $result ) );
</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">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getPostTypes( array( 1, 'editor', 'editor', array( 'hierarchical' => true ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify that page is in the result, and post is not.
</span><span class="cx" style="display: block; padding: 0 10px"> $result_names = wp_list_pluck( $result, 'name' );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetRevisionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ); // Create the initial revision.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_getRevisions( array( 1, 'editor', 'editor', $post_id ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_insert_post(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,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"> $result = $this->myxmlrpcserver->wp_getRevisions( array( 1, 'editor', 'editor', $post_id ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $result );
</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="trunktestsphpunittestsxmlrpcwpgetTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,11 +79,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $result, $term );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check data types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['name'] );
- $this->assertInternalType( 'string', $result['slug'] );
- $this->assertInternalType( 'string', $result['taxonomy'] );
- $this->assertInternalType( 'string', $result['description'] );
- $this->assertInternalType( 'int', $result['count'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['name'] );
+ $this->assertIsString( $result['slug'] );
+ $this->assertIsString( $result['taxonomy'] );
+ $this->assertIsString( $result['description'] );
+ $this->assertIsInt( $result['count'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We expect all ID's to be strings not integers so we don't return something larger than an XMLRPC integer can describe.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringMatchesFormat( '%d', $result['term_id'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</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->assertInternalType( 'array', $result['custom_fields'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result['custom_fields'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_meta = get_term_meta( self::$term_id, '', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $term_meta['foo'][0], $result['custom_fields'][0]['value'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,10 +48,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $results );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $results as $term ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $term['count'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $term['count'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check custom term meta.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $term['custom_fields'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $term['custom_fields'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We expect all other IDs to be strings, not integers,
</span><span class="cx" style="display: block; padding: 0 10px"> // so we don't return something larger than an XMLRPC integer can describe.
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetUserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getUser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getUser.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getUser.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,19 +69,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check data types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['user_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['user_id'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringMatchesFormat( '%d', $result['user_id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['username'] );
- $this->assertInternalType( 'string', $result['first_name'] );
- $this->assertInternalType( 'string', $result['last_name'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['username'] );
+ $this->assertIsString( $result['first_name'] );
+ $this->assertIsString( $result['last_name'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Date', $result['registered'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['bio'] );
- $this->assertInternalType( 'string', $result['email'] );
- $this->assertInternalType( 'string', $result['nickname'] );
- $this->assertInternalType( 'string', $result['nicename'] );
- $this->assertInternalType( 'string', $result['url'] );
- $this->assertInternalType( 'string', $result['display_name'] );
- $this->assertInternalType( 'array', $result['roles'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['bio'] );
+ $this->assertIsString( $result['email'] );
+ $this->assertIsString( $result['nickname'] );
+ $this->assertIsString( $result['nicename'] );
+ $this->assertIsString( $result['url'] );
+ $this->assertIsString( $result['display_name'] );
+ $this->assertIsArray( $result['roles'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check expected values.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $user_id, $result['user_id'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetUsersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getUsers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getUsers.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getUsers.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,19 +27,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check data types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result[0]['user_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result[0]['user_id'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringMatchesFormat( '%d', $result[0]['user_id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result[0]['username'] );
- $this->assertInternalType( 'string', $result[0]['first_name'] );
- $this->assertInternalType( 'string', $result[0]['last_name'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result[0]['username'] );
+ $this->assertIsString( $result[0]['first_name'] );
+ $this->assertIsString( $result[0]['last_name'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Date', $result[0]['registered'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result[0]['bio'] );
- $this->assertInternalType( 'string', $result[0]['email'] );
- $this->assertInternalType( 'string', $result[0]['nickname'] );
- $this->assertInternalType( 'string', $result[0]['nicename'] );
- $this->assertInternalType( 'string', $result[0]['url'] );
- $this->assertInternalType( 'string', $result[0]['display_name'] );
- $this->assertInternalType( 'array', $result[0]['roles'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result[0]['bio'] );
+ $this->assertIsString( $result[0]['email'] );
+ $this->assertIsString( $result[0]['nickname'] );
+ $this->assertIsString( $result[0]['nicename'] );
+ $this->assertIsString( $result[0]['url'] );
+ $this->assertIsString( $result[0]['display_name'] );
+ $this->assertIsArray( $result[0]['roles'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_invalid_role() {
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpnewCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newComment( $comment_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,7 +290,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newComment( $comment_args );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $expected ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'int', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsInt( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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="trunktestsphpunittestsxmlrpcwpnewPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,11 +280,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tag1 = wp_create_tag( 'tag1' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $tag1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $tag1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag2 = wp_create_tag( 'tag2' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $tag2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $tag2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag3 = wp_create_tag( 'tag3' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'array', $tag3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $tag3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Test',
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpsetOptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/setOptions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/setOptions.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/setOptions.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,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->assertInternalType( 'array', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsArray( $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $escaped_string_with_quote, $result['blog_title']['value'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'open', $result['default_comment_status']['value'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpuploadFilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php 2021-07-05 15:46:40 UTC (rev 51330)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php 2021-07-05 17:21:53 UTC (rev 51331)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,10 +27,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check data types.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['id'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringMatchesFormat( '%d', $result['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertInternalType( 'string', $result['file'] );
- $this->assertInternalType( 'string', $result['url'] );
- $this->assertInternalType( 'string', $result['type'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertIsString( $result['file'] );
+ $this->assertIsString( $result['url'] );
+ $this->assertIsString( $result['type'] );
</ins><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>