<!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>[48937] trunk/tests/phpunit: Tests: First pass at using `assertSame()` instead of `assertEquals()` in most of the 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/48937">48937</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/48937","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>2020-09-02 00:35:36 +0000 (Wed, 02 Sep 2020)</dd>

</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Tests: First pass at using `assertSame()` instead of `assertEquals()` in most of the unit tests.

This ensures that not only the return values match the expected results, but also that their type is the same.

Going forward, stricter type checking by using `assertSame()` should generally be preferred to `assertEquals()` where appropriate, to make the tests more reliable.

Props johnbillion, jrf, SergeyBiryukov.

See <a href="https://core.trac.wordpress.org/ticket/38266">#38266</a>.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunktestsphpunitincludesabstracttestcasephp">trunk/tests/phpunit/includes/abstract-testcase.php</a></li>

<li><a href="#trunktestsphpunittestsactionscallbacksphp">trunk/tests/phpunit/tests/actions/callbacks.php</a></li>

<li><a href="#trunktestsphpunittestsactionsphp">trunk/tests/phpunit/tests/actions.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesCommunityEventsphp">trunk/tests/phpunit/tests/admin/includesCommunityEvents.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesFilephp">trunk/tests/phpunit/tests/admin/includesFile.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesMiscphp">trunk/tests/phpunit/tests/admin/includesMisc.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesPluginphp">trunk/tests/phpunit/tests/admin/includesPlugin.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesPostphp">trunk/tests/phpunit/tests/admin/includesPost.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesSchemaphp">trunk/tests/phpunit/tests/admin/includesSchema.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesScreenphp">trunk/tests/phpunit/tests/admin/includesScreen.php</a></li>

<li><a href="#trunktestsphpunittestsadminincludesThemephp">trunk/tests/phpunit/tests/admin/includesTheme.php</a></li>

<li><a href="#trunktestsphpunittestsadminbarphp">trunk/tests/phpunit/tests/adminbar.php</a></li>

<li><a href="#trunktestsphpunittestsajaxAddMetaphp">trunk/tests/phpunit/tests/ajax/AddMeta.php</a></li>

<li><a href="#trunktestsphpunittestsajaxAttachmentsphp">trunk/tests/phpunit/tests/ajax/Attachments.php</a></li>

<li><a href="#trunktestsphpunittestsajaxCompressionphp">trunk/tests/phpunit/tests/ajax/Compression.php</a></li>

<li><a href="#trunktestsphpunittestsajaxCustomizeManagerphp">trunk/tests/phpunit/tests/ajax/CustomizeManager.php</a></li>

<li><a href="#trunktestsphpunittestsajaxCustomizeMenusphp">trunk/tests/phpunit/tests/ajax/CustomizeMenus.php</a></li>

<li><a href="#trunktestsphpunittestsajaxDeleteCommentphp">trunk/tests/phpunit/tests/ajax/DeleteComment.php</a></li>

<li><a href="#trunktestsphpunittestsajaxDimCommentphp">trunk/tests/phpunit/tests/ajax/DimComment.php</a></li>

<li><a href="#trunktestsphpunittestsajaxEditCommentphp">trunk/tests/phpunit/tests/ajax/EditComment.php</a></li>

<li><a href="#trunktestsphpunittestsajaxGetCommentsphp">trunk/tests/phpunit/tests/ajax/GetComments.php</a></li>

<li><a href="#trunktestsphpunittestsajaxReplytoCommentphp">trunk/tests/phpunit/tests/ajax/ReplytoComment.php</a></li>

<li><a href="#trunktestsphpunittestsajaxTagSearchphp">trunk/tests/phpunit/tests/ajax/TagSearch.php</a></li>

<li><a href="#trunktestsphpunittestsattachmentslashesphp">trunk/tests/phpunit/tests/attachment/slashes.php</a></li>

<li><a href="#trunktestsphpunittestsauthphp">trunk/tests/phpunit/tests/auth.php</a></li>

<li><a href="#trunktestsphpunittestsavatarphp">trunk/tests/phpunit/tests/avatar.php</a></li>

<li><a href="#trunktestsphpunittestsbasicphp">trunk/tests/phpunit/tests/basic.php</a></li>

<li><a href="#trunktestsphpunittestsblocksblockcontextphp">trunk/tests/phpunit/tests/blocks/block-context.php</a></li>

<li><a href="#trunktestsphpunittestsblocksblocklistphp">trunk/tests/phpunit/tests/blocks/block-list.php</a></li>

<li><a href="#trunktestsphpunittestsblocksblockparserphp">trunk/tests/phpunit/tests/blocks/block-parser.php</a></li>

<li><a href="#trunktestsphpunittestsblocksblocktyperegistryphp">trunk/tests/phpunit/tests/blocks/block-type-registry.php</a></li>

<li><a href="#trunktestsphpunittestsblocksblocktypephp">trunk/tests/phpunit/tests/blocks/block-type.php</a></li>

<li><a href="#trunktestsphpunittestsblocksblockphp">trunk/tests/phpunit/tests/blocks/block.php</a></li>

<li><a href="#trunktestsphpunittestsblocksregisterphp">trunk/tests/phpunit/tests/blocks/register.php</a></li>

<li><a href="#trunktestsphpunittestsblocksrenderphp">trunk/tests/phpunit/tests/blocks/render.php</a></li>

<li><a href="#trunktestsphpunittestsblocksserializationphp">trunk/tests/phpunit/tests/blocks/serialization.php</a></li>

<li><a href="#trunktestsphpunittestscachephp">trunk/tests/phpunit/tests/cache.php</a></li>

<li><a href="#trunktestsphpunittestscanonicalhttpsphp">trunk/tests/phpunit/tests/canonical/https.php</a></li>

<li><a href="#trunktestsphpunittestscanonicalphp">trunk/tests/phpunit/tests/canonical.php</a></li>

<li><a href="#trunktestsphpunittestscategoryphp">trunk/tests/phpunit/tests/category.php</a></li>

<li><a href="#trunktestsphpunittestscommentdateQueryphp">trunk/tests/phpunit/tests/comment/dateQuery.php</a></li>

<li><a href="#trunktestsphpunittestscommentgetCommentAuthorEmailLinkphp">trunk/tests/phpunit/tests/comment/getCommentAuthorEmailLink.php</a></li>

<li><a href="#trunktestsphpunittestscommentgetCommentAuthorUrlLinkphp">trunk/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php</a></li>

<li><a href="#trunktestsphpunittestscommentgetCommentExcerptphp">trunk/tests/phpunit/tests/comment/getCommentExcerpt.php</a></li>

<li><a href="#trunktestsphpunittestscommentgetCommentsPagesCountphp">trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php</a></li>

<li><a href="#trunktestsphpunittestscommentgetPageOfCommentphp">trunk/tests/phpunit/tests/comment/getPageOfComment.php</a></li>

<li><a href="#trunktestsphpunittestscommentqueryphp">trunk/tests/phpunit/tests/comment/query.php</a></li>

<li><a href="#trunktestsphpunittestscommentslashesphp">trunk/tests/phpunit/tests/comment/slashes.php</a></li>

<li><a href="#trunktestsphpunittestscommenttemplatephp">trunk/tests/phpunit/tests/comment/template.php</a></li>

<li><a href="#trunktestsphpunittestscommentwpBatchUpdateCommentTypephp">trunk/tests/phpunit/tests/comment/wpBatchUpdateCommentType.php</a></li>

<li><a href="#trunktestsphpunittestscommentwpCountCommentsphp">trunk/tests/phpunit/tests/comment/wpCountComments.php</a></li>

<li><a href="#trunktestsphpunittestscommentsubmissionphp">trunk/tests/phpunit/tests/comment-submission.php</a></li>

<li><a href="#trunktestsphpunittestscommentphp">trunk/tests/phpunit/tests/comment.php</a></li>

<li><a href="#trunktestsphpunittestscompatphp">trunk/tests/phpunit/tests/compat.php</a></li>

<li><a href="#trunktestsphpunittestscronphp">trunk/tests/phpunit/tests/cron.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="#trunktestsphpunittestsdatedateI18nphp">trunk/tests/phpunit/tests/date/dateI18n.php</a></li>

<li><a href="#trunktestsphpunittestsdategetCommentDatephp">trunk/tests/phpunit/tests/date/getCommentDate.php</a></li>

<li><a href="#trunktestsphpunittestsdategetFeedBuildDatephp">trunk/tests/phpunit/tests/date/getFeedBuildDate.php</a></li>

<li><a href="#trunktestsphpunittestsdategetPermalinkphp">trunk/tests/phpunit/tests/date/getPermalink.php</a></li>

<li><a href="#trunktestsphpunittestsdategetPostTimephp">trunk/tests/phpunit/tests/date/getPostTime.php</a></li>

<li><a href="#trunktestsphpunittestsdategetTheDatephp">trunk/tests/phpunit/tests/date/getTheDate.php</a></li>

<li><a href="#trunktestsphpunittestsdategetTheModifiedDatephp">trunk/tests/phpunit/tests/date/getTheModifiedDate.php</a></li>

<li><a href="#trunktestsphpunittestsdatemaybeDeclineDatephp">trunk/tests/phpunit/tests/date/maybeDeclineDate.php</a></li>

<li><a href="#trunktestsphpunittestsdatemysql2datephp">trunk/tests/phpunit/tests/date/mysql2date.php</a></li>

<li><a href="#trunktestsphpunittestsdatequeryphp">trunk/tests/phpunit/tests/date/query.php</a></li>

<li><a href="#trunktestsphpunittestsdatetheDatephp">trunk/tests/phpunit/tests/date/theDate.php</a></li>

<li><a href="#trunktestsphpunittestsdatewpDatephp">trunk/tests/phpunit/tests/date/wpDate.php</a></li>

<li><a href="#trunktestsphpunittestsdatewpTimezonephp">trunk/tests/phpunit/tests/date/wpTimezone.php</a></li>

<li><a href="#trunktestsphpunittestsdatexmlrpcphp">trunk/tests/phpunit/tests/date/xmlrpc.php</a></li>

<li><a href="#trunktestsphpunittestsdbcharsetphp">trunk/tests/phpunit/tests/db/charset.php</a></li>

<li><a href="#trunktestsphpunittestsdbphp">trunk/tests/phpunit/tests/db.php</a></li>

<li><a href="#trunktestsphpunittestsdbdeltaphp">trunk/tests/phpunit/tests/dbdelta.php</a></li>

<li><a href="#trunktestsphpunittestsdependenciesjqueryphp">trunk/tests/phpunit/tests/dependencies/jquery.php</a></li>

<li><a href="#trunktestsphpunittestsdependenciesscriptsphp">trunk/tests/phpunit/tests/dependencies/scripts.php</a></li>

<li><a href="#trunktestsphpunittestsdependenciesstylesphp">trunk/tests/phpunit/tests/dependencies/styles.php</a></li>

<li><a href="#trunktestsphpunittestsdependenciesphp">trunk/tests/phpunit/tests/dependencies.php</a></li>

<li><a href="#trunktestsphpunittestserrorprotectionrecoverymodecookieservicephp">trunk/tests/phpunit/tests/error-protection/recovery-mode-cookie-service.php</a></li>

<li><a href="#trunktestsphpunittestserrorprotectionrecoverymodekeyservicephp">trunk/tests/phpunit/tests/error-protection/recovery-mode-key-service.php</a></li>

<li><a href="#trunktestsphpunittestsfeedatomphp">trunk/tests/phpunit/tests/feed/atom.php</a></li>

<li><a href="#trunktestsphpunittestsfeedrss2php">trunk/tests/phpunit/tests/feed/rss2.php</a></li>

<li><a href="#trunktestsphpunittestsfilephp">trunk/tests/phpunit/tests/file.php</a></li>

<li><a href="#trunktestsphpunittestsfilesystemfindFolderphp">trunk/tests/phpunit/tests/filesystem/findFolder.php</a></li>

<li><a href="#trunktestsphpunittestsfiltersphp">trunk/tests/phpunit/tests/filters.php</a></li>

<li><a href="#trunktestsphpunittestsformattingAutopphp">trunk/tests/phpunit/tests/formatting/Autop.php</a></li>

<li><a href="#trunktestsphpunittestsformattingBlogInfophp">trunk/tests/phpunit/tests/formatting/BlogInfo.php</a></li>

<li><a href="#trunktestsphpunittestsformattingCapitalPDangitphp">trunk/tests/phpunit/tests/formatting/CapitalPDangit.php</a></li>

<li><a href="#trunktestsphpunittestsformattingCleanPrephp">trunk/tests/phpunit/tests/formatting/CleanPre.php</a></li>

<li><a href="#trunktestsphpunittestsformattingConvertInvalidEntriesphp">trunk/tests/phpunit/tests/formatting/ConvertInvalidEntries.php</a></li>

<li><a href="#trunktestsphpunittestsformattingEscAttrphp">trunk/tests/phpunit/tests/formatting/EscAttr.php</a></li>

<li><a href="#trunktestsphpunittestsformattingEscHtmlphp">trunk/tests/phpunit/tests/formatting/EscHtml.php</a></li>

<li><a href="#trunktestsphpunittestsformattingEscTextareaphp">trunk/tests/phpunit/tests/formatting/EscTextarea.php</a></li>

<li><a href="#trunktestsphpunittestsformattingEscUrlphp">trunk/tests/phpunit/tests/formatting/EscUrl.php</a></li>

<li><a href="#trunktestsphpunittestsformattingEscXmlphp">trunk/tests/phpunit/tests/formatting/EscXml.php</a></li>

<li><a href="#trunktestsphpunittestsformattingExcerptRemoveBlocksphp">trunk/tests/phpunit/tests/formatting/ExcerptRemoveBlocks.php</a></li>

<li><a href="#trunktestsphpunittestsformattingGetUrlInContentphp">trunk/tests/phpunit/tests/formatting/GetUrlInContent.php</a></li>

<li><a href="#trunktestsphpunittestsformattingHtmlExcerptphp">trunk/tests/phpunit/tests/formatting/HtmlExcerpt.php</a></li>

<li><a href="#trunktestsphpunittestsformattingHumanTimeDiffphp">trunk/tests/phpunit/tests/formatting/HumanTimeDiff.php</a></li>

<li><a href="#trunktestsphpunittestsformattingIsEmailphp">trunk/tests/phpunit/tests/formatting/IsEmail.php</a></li>

<li><a href="#trunktestsphpunittestsformattingJSEscapephp">trunk/tests/phpunit/tests/formatting/JSEscape.php</a></li>

<li><a href="#trunktestsphpunittestsformattingLikeEscapephp">trunk/tests/phpunit/tests/formatting/LikeEscape.php</a></li>

<li><a href="#trunktestsphpunittestsformattingLinksAddTargetphp">trunk/tests/phpunit/tests/formatting/LinksAddTarget.php</a></li>

<li><a href="#trunktestsphpunittestsformattingMakeClickablephp">trunk/tests/phpunit/tests/formatting/MakeClickable.php</a></li>

<li><a href="#trunktestsphpunittestsformattingMapDeepphp">trunk/tests/phpunit/tests/formatting/MapDeep.php</a></li>

<li><a href="#trunktestsphpunittestsformattingNormalizeWhitespacephp">trunk/tests/phpunit/tests/formatting/NormalizeWhitespace.php</a></li>

<li><a href="#trunktestsphpunittestsformattingRemoveAccentsphp">trunk/tests/phpunit/tests/formatting/RemoveAccents.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSanitizeFileNamephp">trunk/tests/phpunit/tests/formatting/SanitizeFileName.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSanitizeMimeTypephp">trunk/tests/phpunit/tests/formatting/SanitizeMimeType.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSanitizeOrderbyphp">trunk/tests/phpunit/tests/formatting/SanitizeOrderby.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSanitizeTextFieldphp">trunk/tests/phpunit/tests/formatting/SanitizeTextField.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSanitizeTitlephp">trunk/tests/phpunit/tests/formatting/SanitizeTitle.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSanitizeTitleWithDashesphp">trunk/tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSanitizeTrackbackUrlsphp">trunk/tests/phpunit/tests/formatting/SanitizeTrackbackUrls.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSanitizeUserphp">trunk/tests/phpunit/tests/formatting/SanitizeUser.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSlashitphp">trunk/tests/phpunit/tests/formatting/Slashit.php</a></li>

<li><a href="#trunktestsphpunittestsformattingSmiliesphp">trunk/tests/phpunit/tests/formatting/Smilies.php</a></li>

<li><a href="#trunktestsphpunittestsformattingStripSlashesDeepphp">trunk/tests/phpunit/tests/formatting/StripSlashesDeep.php</a></li>

<li><a href="#trunktestsphpunittestsformattingURLShortenphp">trunk/tests/phpunit/tests/formatting/URLShorten.php</a></li>

<li><a href="#trunktestsphpunittestsformattingUrlencodeDeepphp">trunk/tests/phpunit/tests/formatting/UrlencodeDeep.php</a></li>

<li><a href="#trunktestsphpunittestsformattingUtf8UriEncodephp">trunk/tests/phpunit/tests/formatting/Utf8UriEncode.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPBasenamephp">trunk/tests/phpunit/tests/formatting/WPBasename.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPMakeLinkRelativephp">trunk/tests/phpunit/tests/formatting/WPMakeLinkRelative.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPRelNoFollowphp">trunk/tests/phpunit/tests/formatting/WPRelNoFollow.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPRelUgcphp">trunk/tests/phpunit/tests/formatting/WPRelUgc.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPSlashphp">trunk/tests/phpunit/tests/formatting/WPSlash.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPSpecialcharsphp">trunk/tests/phpunit/tests/formatting/WPSpecialchars.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPStripAllTagsphp">trunk/tests/phpunit/tests/formatting/WPStripAllTags.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPTargetedLinkRelphp">trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPTexturizephp">trunk/tests/phpunit/tests/formatting/WPTexturize.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWPTrimWordsphp">trunk/tests/phpunit/tests/formatting/WPTrimWords.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWpHtmlEditPrephp">trunk/tests/phpunit/tests/formatting/WpHtmlEditPre.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWpHtmlSplitphp">trunk/tests/phpunit/tests/formatting/WpHtmlSplit.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWpReplaceInHtmlTagsphp">trunk/tests/phpunit/tests/formatting/WpReplaceInHtmlTags.php</a></li>

<li><a href="#trunktestsphpunittestsformattingWpRichEditPrephp">trunk/tests/phpunit/tests/formatting/WpRichEditPre.php</a></li>

<li><a href="#trunktestsphpunittestsformattingZeroisephp">trunk/tests/phpunit/tests/formatting/Zeroise.php</a></li>

<li><a href="#trunktestsphpunittestsformattingbalanceTagsphp">trunk/tests/phpunit/tests/formatting/balanceTags.php</a></li>

<li><a href="#trunktestsphpunittestsformattingdatephp">trunk/tests/phpunit/tests/formatting/date.php</a></li>

<li><a href="#trunktestsphpunittestsformattingent2ncrphp">trunk/tests/phpunit/tests/formatting/ent2ncr.php</a></li>

<li><a href="#trunktestsphpunittestsformattingisoDescramblerphp">trunk/tests/phpunit/tests/formatting/isoDescrambler.php</a></li>

<li><a href="#trunktestsphpunittestsformattingredirectphp">trunk/tests/phpunit/tests/formatting/redirect.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionsallowedProtocolsphp">trunk/tests/phpunit/tests/functions/allowedProtocols.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionsanonymizationphp">trunk/tests/phpunit/tests/functions/anonymization.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionscanonicalCharsetphp">trunk/tests/phpunit/tests/functions/canonicalCharset.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionscleanupHeaderCommentphp">trunk/tests/phpunit/tests/functions/cleanupHeaderComment.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionsgetWeekstartendphp">trunk/tests/phpunit/tests/functions/getWeekstartend.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionsnumberFormatI18nphp">trunk/tests/phpunit/tests/functions/numberFormatI18n.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionsremoveQueryArgphp">trunk/tests/phpunit/tests/functions/removeQueryArg.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionswpGetArchivesphp">trunk/tests/phpunit/tests/functions/wpGetArchives.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionswpListFilterphp">trunk/tests/phpunit/tests/functions/wpListFilter.php</a></li>

<li><a href="#trunktestsphpunittestsfunctionswpListUtilphp">trunk/tests/phpunit/tests/functions/wpListUtil.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="#trunktestsphpunittestsgeneralarchivesphp">trunk/tests/phpunit/tests/general/archives.php</a></li>

<li><a href="#trunktestsphpunittestsgeneraldocumenttitlephp">trunk/tests/phpunit/tests/general/document-title.php</a></li>

<li><a href="#trunktestsphpunittestsgeneralpaginateLinksphp">trunk/tests/phpunit/tests/general/paginateLinks.php</a></li>

<li><a href="#trunktestsphpunittestsgeneralresourceHintsphp">trunk/tests/phpunit/tests/general/resourceHints.php</a></li>

<li><a href="#trunktestsphpunittestsgeneraltemplatephp">trunk/tests/phpunit/tests/general/template.php</a></li>

<li><a href="#trunktestsphpunittestsgeneralwpErrorphp">trunk/tests/phpunit/tests/general/wpError.php</a></li>

<li><a href="#trunktestsphpunittestshooksaddFilterphp">trunk/tests/phpunit/tests/hooks/addFilter.php</a></li>

<li><a href="#trunktestsphpunittestshooksapplyFiltersphp">trunk/tests/phpunit/tests/hooks/applyFilters.php</a></li>

<li><a href="#trunktestsphpunittestshooksdoActionphp">trunk/tests/phpunit/tests/hooks/doAction.php</a></li>

<li><a href="#trunktestsphpunittestshooksdoAllHookphp">trunk/tests/phpunit/tests/hooks/doAllHook.php</a></li>

<li><a href="#trunktestsphpunittestshookshasFilterphp">trunk/tests/phpunit/tests/hooks/hasFilter.php</a></li>

<li><a href="#trunktestsphpunittestshookspreinitHooksphp">trunk/tests/phpunit/tests/hooks/preinitHooks.php</a></li>

<li><a href="#trunktestsphpunittestshooksremoveAllFiltersphp">trunk/tests/phpunit/tests/hooks/removeAllFilters.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="#trunktestsphpunittestshttphttpphp">trunk/tests/phpunit/tests/http/http.php</a></li>

<li><a href="#trunktestsphpunittestshttpremoteRetrieveHeadersphp">trunk/tests/phpunit/tests/http/remoteRetrieveHeaders.php</a></li>

<li><a href="#trunktestsphpunittestsimagebasephp">trunk/tests/phpunit/tests/image/base.php</a></li>

<li><a href="#trunktestsphpunittestsimagedimensionsphp">trunk/tests/phpunit/tests/image/dimensions.php</a></li>

<li><a href="#trunktestsphpunittestsimageeditorphp">trunk/tests/phpunit/tests/image/editor.php</a></li>

<li><a href="#trunktestsphpunittestsimageeditorGdphp">trunk/tests/phpunit/tests/image/editorGd.php</a></li>

<li><a href="#trunktestsphpunittestsimageeditorImagickphp">trunk/tests/phpunit/tests/image/editorImagick.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="#trunktestsphpunittestsimagemetaphp">trunk/tests/phpunit/tests/image/meta.php</a></li>

<li><a href="#trunktestsphpunittestsimageresizephp">trunk/tests/phpunit/tests/image/resize.php</a></li>

<li><a href="#trunktestsphpunittestsimageresizeGdphp">trunk/tests/phpunit/tests/image/resizeGd.php</a></li>

<li><a href="#trunktestsphpunittestsimagesiteIconphp">trunk/tests/phpunit/tests/image/siteIcon.php</a></li>

<li><a href="#trunktestsphpunittestsimportimportphp">trunk/tests/phpunit/tests/import/import.php</a></li>

<li><a href="#trunktestsphpunittestsimportparserphp">trunk/tests/phpunit/tests/import/parser.php</a></li>

<li><a href="#trunktestsphpunittestsimportpostmetaphp">trunk/tests/phpunit/tests/import/postmeta.php</a></li>

<li><a href="#trunktestsphpunittestsincludesfactoryphp">trunk/tests/phpunit/tests/includes/factory.php</a></li>

<li><a href="#trunktestsphpunittestsksesphp">trunk/tests/phpunit/tests/kses.php</a></li>

<li><a href="#trunktestsphpunittestsl10nloadScriptTextdomainphp">trunk/tests/phpunit/tests/l10n/loadScriptTextdomain.php</a></li>

<li><a href="#trunktestsphpunittestsl10nphp">trunk/tests/phpunit/tests/l10n.php</a></li>

<li><a href="#trunktestsphpunittestslinkgetAdjacentPostphp">trunk/tests/phpunit/tests/link/getAdjacentPost.php</a></li>

<li><a href="#trunktestsphpunittestslinkgetDashboardUrlphp">trunk/tests/phpunit/tests/link/getDashboardUrl.php</a></li>

<li><a href="#trunktestsphpunittestslinkgetPostCommentsFeedLinkphp">trunk/tests/phpunit/tests/link/getPostCommentsFeedLink.php</a></li>

<li><a href="#trunktestsphpunittestslinkgetPreviewPostLinkphp">trunk/tests/phpunit/tests/link/getPreviewPostLink.php</a></li>

<li><a href="#trunktestsphpunittestslinkgetPreviousCommentsLinkphp">trunk/tests/phpunit/tests/link/getPreviousCommentsLink.php</a></li>

<li><a href="#trunktestsphpunittestslinkwpGetCanonicalURLphp">trunk/tests/phpunit/tests/link/wpGetCanonicalURL.php</a></li>

<li><a href="#trunktestsphpunittestslinkphp">trunk/tests/phpunit/tests/link.php</a></li>

<li><a href="#trunktestsphpunittestslocalephp">trunk/tests/phpunit/tests/locale.php</a></li>

<li><a href="#trunktestsphpunittestsmailphp">trunk/tests/phpunit/tests/mail.php</a></li>

<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>

<li><a href="#trunktestsphpunittestsmenunavmenuphp">trunk/tests/phpunit/tests/menu/nav-menu.php</a></li>

<li><a href="#trunktestsphpunittestsmenuwpExpandNavMenuPostDataphp">trunk/tests/phpunit/tests/menu/wpExpandNavMenuPostData.php</a></li>

<li><a href="#trunktestsphpunittestsmetadeleteMetadataphp">trunk/tests/phpunit/tests/meta/deleteMetadata.php</a></li>

<li><a href="#trunktestsphpunittestsmetaqueryphp">trunk/tests/phpunit/tests/meta/query.php</a></li>

<li><a href="#trunktestsphpunittestsmetaregisterMetaphp">trunk/tests/phpunit/tests/meta/registerMeta.php</a></li>

<li><a href="#trunktestsphpunittestsmetaslashesphp">trunk/tests/phpunit/tests/meta/slashes.php</a></li>

<li><a href="#trunktestsphpunittestsmetaphp">trunk/tests/phpunit/tests/meta.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitebootstrapphp">trunk/tests/phpunit/tests/multisite/bootstrap.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitegetBlogDetailsphp">trunk/tests/phpunit/tests/multisite/getBlogDetails.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitegetIdFromBlognamephp">trunk/tests/phpunit/tests/multisite/getIdFromBlogname.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitegetSitephp">trunk/tests/phpunit/tests/multisite/getSite.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitegetSpaceAllowedphp">trunk/tests/phpunit/tests/multisite/getSpaceAllowed.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitegetSpaceUsedphp">trunk/tests/phpunit/tests/multisite/getSpaceUsed.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitemsfilesrewritingphp">trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitenetworkphp">trunk/tests/phpunit/tests/multisite/network.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitenetworkQueryphp">trunk/tests/phpunit/tests/multisite/networkQuery.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="#trunktestsphpunittestsmultisitesiteQueryphp">trunk/tests/phpunit/tests/multisite/siteQuery.php</a></li>

<li><a href="#trunktestsphpunittestsmultisiteupdateBlogDetailsphp">trunk/tests/phpunit/tests/multisite/updateBlogDetails.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitewpGetSitesphp">trunk/tests/phpunit/tests/multisite/wpGetSites.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitewpInstallDefaultsphp">trunk/tests/phpunit/tests/multisite/wpInstallDefaults.php</a></li>

<li><a href="#trunktestsphpunittestsmultisitephp">trunk/tests/phpunit/tests/multisite.php</a></li>

<li><a href="#trunktestsphpunittestsoembedWpEmbedphp">trunk/tests/phpunit/tests/oembed/WpEmbed.php</a></li>

<li><a href="#trunktestsphpunittestsoembedcontrollerphp">trunk/tests/phpunit/tests/oembed/controller.php</a></li>

<li><a href="#trunktestsphpunittestsoembeddiscoveryphp">trunk/tests/phpunit/tests/oembed/discovery.php</a></li>

<li><a href="#trunktestsphpunittestsoembedfilterResultphp">trunk/tests/phpunit/tests/oembed/filterResult.php</a></li>

<li><a href="#trunktestsphpunittestsoembedgetResponseDataphp">trunk/tests/phpunit/tests/oembed/getResponseData.php</a></li>

<li><a href="#trunktestsphpunittestsoembedpostEmbedUrlphp">trunk/tests/phpunit/tests/oembed/postEmbedUrl.php</a></li>

<li><a href="#trunktestsphpunittestsoembedtemplatephp">trunk/tests/phpunit/tests/oembed/template.php</a></li>

<li><a href="#trunktestsphpunittestsoembedwpOembedphp">trunk/tests/phpunit/tests/oembed/wpOembed.php</a></li>

<li><a href="#trunktestsphpunittestsoptionmultisitephp">trunk/tests/phpunit/tests/option/multisite.php</a></li>

<li><a href="#trunktestsphpunittestsoptionnetworkOptionphp">trunk/tests/phpunit/tests/option/networkOption.php</a></li>

<li><a href="#trunktestsphpunittestsoptionoptionphp">trunk/tests/phpunit/tests/option/option.php</a></li>

<li><a href="#trunktestsphpunittestsoptionregistrationphp">trunk/tests/phpunit/tests/option/registration.php</a></li>

<li><a href="#trunktestsphpunittestsoptionsanitizeoptionphp">trunk/tests/phpunit/tests/option/sanitize-option.php</a></li>

<li><a href="#trunktestsphpunittestsoptionsiteOptionphp">trunk/tests/phpunit/tests/option/siteOption.php</a></li>

<li><a href="#trunktestsphpunittestsoptionsiteTransientphp">trunk/tests/phpunit/tests/option/siteTransient.php</a></li>

<li><a href="#trunktestsphpunittestsoptionslashesphp">trunk/tests/phpunit/tests/option/slashes.php</a></li>

<li><a href="#trunktestsphpunittestsoptionthemeModsphp">trunk/tests/phpunit/tests/option/themeMods.php</a></li>

<li><a href="#trunktestsphpunittestsoptiontransientphp">trunk/tests/phpunit/tests/option/transient.php</a></li>

<li><a href="#trunktestsphpunittestsoptionupdateOptionphp">trunk/tests/phpunit/tests/option/updateOption.php</a></li>

<li><a href="#trunktestsphpunittestsoptionuserSettingsphp">trunk/tests/phpunit/tests/option/userSettings.php</a></li>

<li><a href="#trunktestsphpunittestsoptionwpLoadAllOptionsphp">trunk/tests/phpunit/tests/option/wpLoadAllOptions.php</a></li>

<li><a href="#trunktestsphpunittestspomomophp">trunk/tests/phpunit/tests/pomo/mo.php</a></li>

<li><a href="#trunktestsphpunittestspomonoopTranslationsphp">trunk/tests/phpunit/tests/pomo/noopTranslations.php</a></li>

<li><a href="#trunktestsphpunittestspomopluralFormsphp">trunk/tests/phpunit/tests/pomo/pluralForms.php</a></li>

<li><a href="#trunktestsphpunittestspomopophp">trunk/tests/phpunit/tests/pomo/po.php</a></li>

<li><a href="#trunktestsphpunittestspomotranslationEntryphp">trunk/tests/phpunit/tests/pomo/translationEntry.php</a></li>

<li><a href="#trunktestsphpunittestspomotranslationsphp">trunk/tests/phpunit/tests/pomo/translations.php</a></li>

<li><a href="#trunktestsphpunittestspostattachmentsphp">trunk/tests/phpunit/tests/post/attachments.php</a></li>

<li><a href="#trunktestsphpunittestspostfilteringphp">trunk/tests/phpunit/tests/post/filtering.php</a></li>

<li><a href="#trunktestsphpunittestspostformatsphp">trunk/tests/phpunit/tests/post/formats.php</a></li>

<li><a href="#trunktestsphpunittestspostgetLastPostDatephp">trunk/tests/phpunit/tests/post/getLastPostDate.php</a></li>

<li><a href="#trunktestsphpunittestspostgetLastPostModifiedphp">trunk/tests/phpunit/tests/post/getLastPostModified.php</a></li>

<li><a href="#trunktestsphpunittestspostgetPageByPathphp">trunk/tests/phpunit/tests/post/getPageByPath.php</a></li>

<li><a href="#trunktestsphpunittestspostgetPageChildrenphp">trunk/tests/phpunit/tests/post/getPageChildren.php</a></li>

<li><a href="#trunktestsphpunittestspostgetPageUriphp">trunk/tests/phpunit/tests/post/getPageUri.php</a></li>

<li><a href="#trunktestsphpunittestspostgetPagesphp">trunk/tests/phpunit/tests/post/getPages.php</a></li>

<li><a href="#trunktestsphpunittestspostgetPostClassphp">trunk/tests/phpunit/tests/post/getPostClass.php</a></li>

<li><a href="#trunktestsphpunittestspostlistPagesphp">trunk/tests/phpunit/tests/post/listPages.php</a></li>

<li><a href="#trunktestsphpunittestspostmetaphp">trunk/tests/phpunit/tests/post/meta.php</a></li>

<li><a href="#trunktestsphpunittestspostnavmenuphp">trunk/tests/phpunit/tests/post/nav-menu.php</a></li>

<li><a href="#trunktestsphpunittestspostobjectsphp">trunk/tests/phpunit/tests/post/objects.php</a></li>

<li><a href="#trunktestsphpunittestspostoutputphp">trunk/tests/phpunit/tests/post/output.php</a></li>

<li><a href="#trunktestsphpunittestspostqueryphp">trunk/tests/phpunit/tests/post/query.php</a></li>

<li><a href="#trunktestsphpunittestspostrevisionsphp">trunk/tests/phpunit/tests/post/revisions.php</a></li>

<li><a href="#trunktestsphpunittestspostslashesphp">trunk/tests/phpunit/tests/post/slashes.php</a></li>

<li><a href="#trunktestsphpunittestsposttemplatephp">trunk/tests/phpunit/tests/post/template.php</a></li>

<li><a href="#trunktestsphpunittestspostthumbnailsphp">trunk/tests/phpunit/tests/post/thumbnails.php</a></li>

<li><a href="#trunktestsphpunittestsposttypesphp">trunk/tests/phpunit/tests/post/types.php</a></li>

<li><a href="#trunktestsphpunittestspostwpInsertPostphp">trunk/tests/phpunit/tests/post/wpInsertPost.php</a></li>

<li><a href="#trunktestsphpunittestspostwpUniquePostSlugphp">trunk/tests/phpunit/tests/post/wpUniquePostSlug.php</a></li>

<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>

<li><a href="#trunktestsphpunittestsqueryconditionalsphp">trunk/tests/phpunit/tests/query/conditionals.php</a></li>

<li><a href="#trunktestsphpunittestsquerydatephp">trunk/tests/phpunit/tests/query/date.php</a></li>

<li><a href="#trunktestsphpunittestsquerydateQueryphp">trunk/tests/phpunit/tests/query/dateQuery.php</a></li>

<li><a href="#trunktestsphpunittestsquerygeneratePostdataphp">trunk/tests/phpunit/tests/query/generatePostdata.php</a></li>

<li><a href="#trunktestsphpunittestsqueryisTermphp">trunk/tests/phpunit/tests/query/isTerm.php</a></li>

<li><a href="#trunktestsphpunittestsquerymetaQueryphp">trunk/tests/phpunit/tests/query/metaQuery.php</a></li>

<li><a href="#trunktestsphpunittestsqueryparseQueryphp">trunk/tests/phpunit/tests/query/parseQuery.php</a></li>

<li><a href="#trunktestsphpunittestsquerypostStatusphp">trunk/tests/phpunit/tests/query/postStatus.php</a></li>

<li><a href="#trunktestsphpunittestsqueryresultsphp">trunk/tests/phpunit/tests/query/results.php</a></li>

<li><a href="#trunktestsphpunittestsquerysearchphp">trunk/tests/phpunit/tests/query/search.php</a></li>

<li><a href="#trunktestsphpunittestsquerysetupPostdataphp">trunk/tests/phpunit/tests/query/setupPostdata.php</a></li>

<li><a href="#trunktestsphpunittestsquerystickiesphp">trunk/tests/phpunit/tests/query/stickies.php</a></li>

<li><a href="#trunktestsphpunittestsquerytaxQueryphp">trunk/tests/phpunit/tests/query/taxQuery.php</a></li>

<li><a href="#trunktestsphpunittestsqueryvarsphp">trunk/tests/phpunit/tests/query/vars.php</a></li>

<li><a href="#trunktestsphpunittestsqueryphp">trunk/tests/phpunit/tests/query.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestattachmentscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestautosavescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-autosaves-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestblockdirectorycontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-block-directory-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestblockrenderercontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestblocktypecontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-block-type-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestblockscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-blocks-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestcategoriescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestcommentscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestcontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestpagescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-pages-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestpluginscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-plugins-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestpostmetafieldsphp">trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestpoststatusescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestposttypescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-post-types-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestpostscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestrequestvalidationphp">trunk/tests/phpunit/tests/rest-api/rest-request-validation.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestrequestphp">trunk/tests/phpunit/tests/rest-api/rest-request.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestrevisionscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestschemasanitizationphp">trunk/tests/phpunit/tests/rest-api/rest-schema-sanitization.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestschemasetupphp">trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestschemavalidationphp">trunk/tests/phpunit/tests/rest-api/rest-schema-validation.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestsearchcontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-search-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestserverphp">trunk/tests/phpunit/tests/rest-api/rest-server.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestsettingscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-settings-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapiresttagscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapiresttaxonomiescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapiresttermmetafieldsphp">trunk/tests/phpunit/tests/rest-api/rest-term-meta-fields.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestthemescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-themes-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapirestuserscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-users-controller.php</a></li>

<li><a href="#trunktestsphpunittestsrestapiphp">trunk/tests/phpunit/tests/rest-api.php</a></li>

<li><a href="#trunktestsphpunittestsrewritenumericSlugsphp">trunk/tests/phpunit/tests/rewrite/numericSlugs.php</a></li>

<li><a href="#trunktestsphpunittestsrewriteoldSlugRedirectphp">trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php</a></li>

<li><a href="#trunktestsphpunittestsrewritephp">trunk/tests/phpunit/tests/rewrite.php</a></li>

<li><a href="#trunktestsphpunittestsshortcodephp">trunk/tests/phpunit/tests/shortcode.php</a></li>

<li><a href="#trunktestsphpunittestssitemapsfunctionsphp">trunk/tests/phpunit/tests/sitemaps/functions.php</a></li>

<li><a href="#trunktestsphpunittestssitemapssitemapspostsphp">trunk/tests/phpunit/tests/sitemaps/sitemaps-posts.php</a></li>

<li><a href="#trunktestsphpunittestssitemapssitemapstaxonomiesphp">trunk/tests/phpunit/tests/sitemaps/sitemaps-taxonomies.php</a></li>

<li><a href="#trunktestsphpunittestssitemapssitemapsphp">trunk/tests/phpunit/tests/sitemaps/sitemaps.php</a></li>

<li><a href="#trunktestsphpunitteststaxonomyphp">trunk/tests/phpunit/tests/taxonomy.php</a></li>

<li><a href="#trunktestsphpunitteststemplatephp">trunk/tests/phpunit/tests/template.php</a></li>

<li><a href="#trunktestsphpunitteststermcachephp">trunk/tests/phpunit/tests/term/cache.php</a></li>

<li><a href="#trunktestsphpunitteststermgetEditTermLinkphp">trunk/tests/phpunit/tests/term/getEditTermLink.php</a></li>

<li><a href="#trunktestsphpunitteststermgetTermphp">trunk/tests/phpunit/tests/term/getTerm.php</a></li>

<li><a href="#trunktestsphpunitteststermgetTermByphp">trunk/tests/phpunit/tests/term/getTermBy.php</a></li>

<li><a href="#trunktestsphpunitteststermgetTermParentsListphp">trunk/tests/phpunit/tests/term/getTermParentsList.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="#trunktestsphpunitteststermqueryphp">trunk/tests/phpunit/tests/term/query.php</a></li>

<li><a href="#trunktestsphpunitteststermslashesphp">trunk/tests/phpunit/tests/term/slashes.php</a></li>

<li><a href="#trunktestsphpunitteststermsplitSharedTermphp">trunk/tests/phpunit/tests/term/splitSharedTerm.php</a></li>

<li><a href="#trunktestsphpunitteststermtaxQueryphp">trunk/tests/phpunit/tests/term/taxQuery.php</a></li>

<li><a href="#trunktestsphpunitteststermtermExistsphp">trunk/tests/phpunit/tests/term/termExists.php</a></li>

<li><a href="#trunktestsphpunitteststermwpDeleteTermphp">trunk/tests/phpunit/tests/term/wpDeleteTerm.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="#trunktestsphpunitteststermwpUniqueTermSlugphp">trunk/tests/phpunit/tests/term/wpUniqueTermSlug.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="#trunktestsphpunitteststhemeWPThemephp">trunk/tests/phpunit/tests/theme/WPTheme.php</a></li>

<li><a href="#trunktestsphpunitteststhemecustomHeaderphp">trunk/tests/phpunit/tests/theme/customHeader.php</a></li>

<li><a href="#trunktestsphpunitteststhemegetAllowedFiltersphp">trunk/tests/phpunit/tests/theme/getAllowedFilters.php</a></li>

<li><a href="#trunktestsphpunitteststhemegetThemeStarterContentphp">trunk/tests/phpunit/tests/theme/getThemeStarterContent.php</a></li>

<li><a href="#trunktestsphpunitteststhemesupportphp">trunk/tests/phpunit/tests/theme/support.php</a></li>

<li><a href="#trunktestsphpunitteststhemethemeDirphp">trunk/tests/phpunit/tests/theme/themeDir.php</a></li>

<li><a href="#trunktestsphpunitteststhemephp">trunk/tests/phpunit/tests/theme.php</a></li>

<li><a href="#trunktestsphpunittestsuploadphp">trunk/tests/phpunit/tests/upload.php</a></li>

<li><a href="#trunktestsphpunittestsurlphp">trunk/tests/phpunit/tests/url.php</a></li>

<li><a href="#trunktestsphpunittestsuserauthorphp">trunk/tests/phpunit/tests/user/author.php</a></li>

<li><a href="#trunktestsphpunittestsusercapabilitiesphp">trunk/tests/phpunit/tests/user/capabilities.php</a></li>

<li><a href="#trunktestsphpunittestsusercountUsersphp">trunk/tests/phpunit/tests/user/countUsers.php</a></li>

<li><a href="#trunktestsphpunittestsusergetActiveBlogForUserphp">trunk/tests/phpunit/tests/user/getActiveBlogForUser.php</a></li>

<li><a href="#trunktestsphpunittestsusermapMetaCapphp">trunk/tests/phpunit/tests/user/mapMetaCap.php</a></li>

<li><a href="#trunktestsphpunittestsusermultisitephp">trunk/tests/phpunit/tests/user/multisite.php</a></li>

<li><a href="#trunktestsphpunittestsuserqueryphp">trunk/tests/phpunit/tests/user/query.php</a></li>

<li><a href="#trunktestsphpunittestsuserslashesphp">trunk/tests/phpunit/tests/user/slashes.php</a></li>

<li><a href="#trunktestsphpunittestsuserupdateUserCachesphp">trunk/tests/phpunit/tests/user/updateUserCaches.php</a></li>

<li><a href="#trunktestsphpunittestsuserwpAuthenticateSpamCheckphp">trunk/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php</a></li>

<li><a href="#trunktestsphpunittestsuserwpDeleteUserphp">trunk/tests/phpunit/tests/user/wpDeleteUser.php</a></li>

<li><a href="#trunktestsphpunittestsuserwpSetCurrentUserphp">trunk/tests/phpunit/tests/user/wpSetCurrentUser.php</a></li>

<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>

<li><a href="#trunktestsphpunittestswalkerphp">trunk/tests/phpunit/tests/walker.php</a></li>

<li><a href="#trunktestsphpunittestswidgetscustomhtmlwidgetphp">trunk/tests/phpunit/tests/widgets/custom-html-widget.php</a></li>

<li><a href="#trunktestsphpunittestswidgetsmediaaudiowidgetphp">trunk/tests/phpunit/tests/widgets/media-audio-widget.php</a></li>

<li><a href="#trunktestsphpunittestswidgetsmediagallerywidgetphp">trunk/tests/phpunit/tests/widgets/media-gallery-widget.php</a></li>

<li><a href="#trunktestsphpunittestswidgetsmediaimagewidgetphp">trunk/tests/phpunit/tests/widgets/media-image-widget.php</a></li>

<li><a href="#trunktestsphpunittestswidgetsmediavideowidgetphp">trunk/tests/phpunit/tests/widgets/media-video-widget.php</a></li>

<li><a href="#trunktestsphpunittestswidgetsmediawidgetphp">trunk/tests/phpunit/tests/widgets/media-widget.php</a></li>

<li><a href="#trunktestsphpunittestswidgetstextwidgetphp">trunk/tests/phpunit/tests/widgets/text-widget.php</a></li>

<li><a href="#trunktestsphpunittestswidgetsphp">trunk/tests/phpunit/tests/widgets.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcbasicphp">trunk/tests/phpunit/tests/xmlrpc/basic.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcclientphp">trunk/tests/phpunit/tests/xmlrpc/client.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcmtgetRecentPostTitlesphp">trunk/tests/phpunit/tests/xmlrpc/mt/getRecentPostTitles.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcmweditPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcmwgetPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/getPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcmwgetRecentPostsphp">trunk/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcmwnewPostphp">trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpdeletePostphp">trunk/tests/phpunit/tests/xmlrpc/wp/deletePost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpdeleteTermphp">trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpeditCommentphp">trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpeditPostphp">trunk/tests/phpunit/tests/xmlrpc/wp/editPost.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpeditProfilephp">trunk/tests/phpunit/tests/xmlrpc/wp/editProfile.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="#trunktestsphpunittestsxmlrpcwpgetPageListphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPageList.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetPagesphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPages.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="#trunktestsphpunittestsxmlrpcwpgetPostsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetProfilephp">trunk/tests/phpunit/tests/xmlrpc/wp/getProfile.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetRevisionsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getRevisions.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetTaxonomiesphp">trunk/tests/phpunit/tests/xmlrpc/wp/getTaxonomies.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpgetTaxonomyphp">trunk/tests/phpunit/tests/xmlrpc/wp/getTaxonomy.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="#trunktestsphpunittestsxmlrpcwpnewTermphp">trunk/tests/phpunit/tests/xmlrpc/wp/newTerm.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwprestoreRevisionphp">trunk/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php</a></li>

<li><a href="#trunktestsphpunittestsxmlrpcwpsetOptionsphp">trunk/tests/phpunit/tests/xmlrpc/wp/setOptions.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunktestsphpunitincludesabstracttestcasephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/abstract-testcase.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/abstract-testcase.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/includes/abstract-testcase.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -660,15 +660,28 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Asserts that two values have the same type and value, with EOL differences discarded.

+        *

+        * @since 5.6.0

+        *

+        * @param string $expected The expected value.

+        * @param string $actual   The actual value.

+        */

+       public function assertSameIgnoreEOL( $expected, $actual ) {

+               $this->assertSame( str_replace( "\r\n", "\n", $expected ), str_replace( "\r\n", "\n", $actual ) );

+       }

+

+       /**

</ins><span class="cx" style="display: block; padding: 0 10px">          * Asserts that two values are equal, with EOL differences discarded.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><span class="cx" style="display: block; padding: 0 10px">         * @since 5.4.0

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 5.6.0 Turned into an alias for `::assertSameIgnoreEOL()`.

</ins><span class="cx" style="display: block; padding: 0 10px">          *

<span class="cx" style="display: block; padding: 0 10px">         * @param string $expected The expected value.

<span class="cx" style="display: block; padding: 0 10px">         * @param string $actual   The actual value.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function assertEqualsIgnoreEOL( $expected, $actual ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( str_replace( "\r\n", "\n", $expected ), str_replace( "\r\n", "\n", $actual ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span></span></pre></div>

<a id="trunktestsphpunittestsactionscallbacksphp"></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/actions/callbacks.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/actions/callbacks.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/actions/callbacks.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,8 +15,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( $tag, array( 'Class', 'method' ) );

</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->assertEquals( 10, has_action( $tag, array( 'Class', 'method' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_action( $tag, array( 'Class', 'method' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 10, has_action( $tag, 'Class::method' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_action( $tag, 'Class::method' ) );

</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="trunktestsphpunittestsactionsphp"></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/actions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/actions.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/actions.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,13 +15,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Only one event occurred for the hook, with empty args.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a->get_call_count() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Only our hook was called.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $tag ), $a->get_tags() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $tag ), $a->get_tags() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $argsvar = $a->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $args    = array_pop( $argsvar );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( '' ), $args );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( '' ), $args );

</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_remove_action() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,14 +32,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Make sure our hook was called correctly.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a->get_call_count() );

-               $this->assertEquals( array( $tag ), $a->get_tags() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a->get_call_count() );

+               $this->assertSame( array( $tag ), $a->get_tags() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Now remove the action, do it again, and make sure it's not called this time.

</span><span class="cx" style="display: block; padding: 0 10px">                remove_action( $tag, array( &$a, 'action' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a->get_call_count() );

-               $this->assertEquals( array( $tag ), $a->get_tags() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a->get_call_count() );

+               $this->assertSame( array( $tag ), $a->get_tags() );

</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">@@ -50,7 +50,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_action( $tag, $func ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_action( $tag ) );

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( $tag, $func );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 10, has_action( $tag, $func ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_action( $tag, $func ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( has_action( $tag ) );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_action( $tag, $func );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_action( $tag, $func ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,8 +70,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Both actions called once each.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a1->get_call_count() );

-               $this->assertEquals( 1, $a2->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a1->get_call_count() );

+               $this->assertSame( 1, $a2->get_call_count() );

</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_action_args_1() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,9 +84,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag, $val );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $call_count = $a->get_call_count();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $call_count );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $call_count );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $argsvar = $a->get_args();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $val ), array_pop( $argsvar ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $val ), array_pop( $argsvar ) );

</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_action_args_2() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,14 +104,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $call_count = $a1->get_call_count();

<span class="cx" style="display: block; padding: 0 10px">                // $a1 should be called with both args.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $call_count );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $call_count );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $argsvar1 = $a1->get_args();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $val1, $val2 ), array_pop( $argsvar1 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $val1, $val2 ), array_pop( $argsvar1 ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // $a2 should be called with one only.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a2->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a2->get_call_count() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $argsvar2 = $a2->get_args();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $val1 ), array_pop( $argsvar2 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $val1 ), array_pop( $argsvar2 ) );

</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">@@ -138,19 +138,19 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $call_count = $a1->get_call_count();

<span class="cx" style="display: block; padding: 0 10px">                // $a1 should be called with both args.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $call_count );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $call_count );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $argsvar1 = $a1->get_args();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $val1, $val2 ), array_pop( $argsvar1 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $val1, $val2 ), array_pop( $argsvar1 ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // $a2 should be called with one only.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a2->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a2->get_call_count() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $argsvar2 = $a2->get_args();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $val1 ), array_pop( $argsvar2 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $val1 ), array_pop( $argsvar2 ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // $a3 should be called with both args.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a3->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a3->get_call_count() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $argsvar3 = $a3->get_args();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $val1, $val2 ), array_pop( $argsvar3 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $val1, $val2 ), array_pop( $argsvar3 ) );

</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">@@ -181,7 +181,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Two events, one per action.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 2, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, $a->get_call_count() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = array(

<span class="cx" style="display: block; padding: 0 10px">                        // 'action2' is called first because it has priority 9.

</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->assertEquals( $expected, $a->get_events() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $a->get_events() );

</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_did_action() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,8 +207,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Do action $tag1 but not $tag2.

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, did_action( $tag1 ) );

-               $this->assertEquals( 0, did_action( $tag2 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, did_action( $tag1 ) );

+               $this->assertSame( 0, did_action( $tag2 ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Do action $tag2 a random number of times.

</span><span class="cx" style="display: block; padding: 0 10px">                $count = rand( 0, 10 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,8 +217,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // $tag1's count hasn't changed, $tag2 should be correct.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, did_action( $tag1 ) );

-               $this->assertEquals( $count, did_action( $tag2 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, did_action( $tag1 ) );

+               $this->assertSame( $count, did_action( $tag2 ) );

</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">@@ -229,7 +229,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Add an 'all' action.

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'all', array( &$a, 'action' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 10, has_filter( 'all', array( &$a, 'action' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_filter( 'all', array( &$a, 'action' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Do some actions.

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag1 );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag2 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,9 +237,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Our action should have been called once for each tag.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 4, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 4, $a->get_call_count() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Only our hook was called.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $tag1, $tag2, $tag1, $tag1 ), $a->get_tags() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $tag1, $tag2, $tag1, $tag1 ), $a->get_tags() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_action( 'all', array( &$a, 'action' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_filter( 'all', array( &$a, 'action' ) ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,19 +251,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $tag = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'all', array( &$a, 'action' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 10, has_filter( 'all', array( &$a, 'action' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_filter( 'all', array( &$a, 'action' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 do_action( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Make sure our hook was called correctly.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a->get_call_count() );

-               $this->assertEquals( array( $tag ), $a->get_tags() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a->get_call_count() );

+               $this->assertSame( array( $tag ), $a->get_tags() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Now remove the action, do it again, and make sure it's not called this time.

</span><span class="cx" style="display: block; padding: 0 10px">                remove_action( 'all', array( &$a, 'action' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_filter( 'all', array( &$a, 'action' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a->get_call_count() );

-               $this->assertEquals( array( $tag ), $a->get_tags() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a->get_call_count() );

+               $this->assertSame( array( $tag ), $a->get_tags() );

</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_action_ref_array() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,7 +312,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_action_self_removal() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'test_action_self_removal', array( $this, 'action_self_removal' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'test_action_self_removal' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, did_action( 'test_action_self_removal' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, did_action( 'test_action_self_removal' ) );

</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 action_self_removal() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,8 +332,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( $tag, array( $this, 'action_that_causes_recursion' ), 12, 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag, $tag );

</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->assertEquals( 2, $a->get_call_count(), 'recursive actions should call all callbacks with earlier priority' );

-               $this->assertEquals( 2, $b->get_call_count(), 'recursive actions should call callbacks with later priority' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, $a->get_call_count(), 'recursive actions should call all callbacks with earlier priority' );

+               $this->assertSame( 2, $b->get_call_count(), 'recursive actions should call callbacks with later priority' );

</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 action_that_causes_recursion( $tag ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,11 +364,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag, $tag, array( $a, $b, $c, $d, $e ) );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( $tag, $tag, array( $a, $b, $c, $d, $e ) );

</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->assertEquals( 2, $a->get_call_count(), 'callbacks should run unless otherwise instructed' );

-               $this->assertEquals( 1, $b->get_call_count(), 'callback removed by same priority callback should still get called' );

-               $this->assertEquals( 1, $c->get_call_count(), 'callback added by same priority callback should not get called' );

-               $this->assertEquals( 2, $d->get_call_count(), 'callback added by earlier priority callback should get called' );

-               $this->assertEquals( 1, $e->get_call_count(), 'callback added by later priority callback should not get called' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, $a->get_call_count(), 'callbacks should run unless otherwise instructed' );

+               $this->assertSame( 1, $b->get_call_count(), 'callback removed by same priority callback should still get called' );

+               $this->assertSame( 1, $c->get_call_count(), 'callback added by same priority callback should not get called' );

+               $this->assertSame( 2, $d->get_call_count(), 'callback added by earlier priority callback should get called' );

+               $this->assertSame( 1, $e->get_call_count(), 'callback added by later priority callback should not get called' );

</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 action_that_manipulates_a_running_hook( $tag, $mocks ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -435,7 +435,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'accepted_args' => 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->assertEquals( 11, has_action( $tag, '__return_null' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 11, has_action( $tag, '__return_null' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,7 +448,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_current_filter[] = 'first';

<span class="cx" style="display: block; padding: 0 10px">                $wp_current_filter[] = 'second'; // Let's say a second action was invoked.

</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->assertEquals( 'second', current_action() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'second', current_action() );

</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">@@ -498,7 +498,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'testing', array( $this, 'apply_testing_filter' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( has_action( 'testing' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 10, has_action( 'testing', array( $this, 'apply_testing_filter' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_action( 'testing', array( $this, 'apply_testing_filter' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                apply_filters( 'testing', '' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,7 +519,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'testing_nested', array( $this, 'apply_testing_nested_filter' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( has_action( 'testing_nested' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 10, has_action( 'testing_nested', array( $this, 'apply_testing_nested_filter' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_action( 'testing_nested', array( $this, 'apply_testing_nested_filter' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                apply_filters( 'testing_nested', '' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsadminincludesCommunityEventsphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesCommunityEvents.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesCommunityEvents.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/admin/includesCommunityEvents.php 2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,8 +164,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $response );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSetsWithIndex( $this->get_user_location(), $response['location'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( gmdate( 'l, M j, Y', strtotime( 'next Sunday 1pm' ) ), $response['events'][0]['formatted_date'] );

-               $this->assertEquals( '1:00 pm', $response['events'][0]['formatted_time'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( gmdate( 'l, M j, Y', strtotime( 'next Sunday 1pm' ) ), $response['events'][0]['formatted_date'] );

+               $this->assertSame( '1:00 pm', $response['events'][0]['formatted_time'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'pre_http_request', array( $this, '_http_request_valid_response' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,8 +185,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $cached_events );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSetsWithIndex( $this->get_user_location(), $cached_events['location'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( gmdate( 'l, M j, Y', strtotime( 'next Sunday 1pm' ) ), $cached_events['events'][0]['formatted_date'] );

-               $this->assertEquals( '1:00 pm', $cached_events['events'][0]['formatted_time'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( gmdate( 'l, M j, Y', strtotime( 'next Sunday 1pm' ) ), $cached_events['events'][0]['formatted_date'] );

+               $this->assertSame( '1:00 pm', $cached_events['events'][0]['formatted_time'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'pre_http_request', array( $this, '_http_request_valid_response' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,9 +273,9 @@

<span class="cx" style="display: block; padding: 0 10px">                 * so that it remains in the list. The other events should remain unchanged.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 3, $response_body['events'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $response_body['events'][0]['title'], 'Flexbox + CSS Grid: Magic for Responsive Layouts' );

-               $this->assertEquals( $response_body['events'][1]['title'], 'Part 3- Site Maintenance - Tools to Make It Easy' );

-               $this->assertEquals( $response_body['events'][2]['title'], 'WordCamp San Diego' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $response_body['events'][0]['title'], 'Flexbox + CSS Grid: Magic for Responsive Layouts' );

+               $this->assertSame( $response_body['events'][1]['title'], 'Part 3- Site Maintenance - Tools to Make It Easy' );

+               $this->assertSame( $response_body['events'][2]['title'], 'WordCamp San Diego' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'pre_http_request', array( $this, '_http_request_valid_response_unpinned_wordcamp' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,9 +375,9 @@

<span class="cx" style="display: block; padding: 0 10px">                 * WordCamp LA should not be stuck to the list, because San Diego already appears naturally.

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 3, $response_body['events'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $response_body['events'][0]['title'], 'WordCamp San Diego' );

-               $this->assertEquals( $response_body['events'][1]['title'], 'Part 3- Site Maintenance - Tools to Make It Easy' );

-               $this->assertEquals( $response_body['events'][2]['title'], 'WordPress Q&A' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $response_body['events'][0]['title'], 'WordCamp San Diego' );

+               $this->assertSame( $response_body['events'][1]['title'], 'Part 3- Site Maintenance - Tools to Make It Easy' );

+               $this->assertSame( $response_body['events'][2]['title'], 'WordPress Q&A' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'pre_http_request', array( $this, '_http_request_valid_response_multiple_wordcamps' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,7 +488,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTP_CLIENT_IP'] = $raw_ip;

</span><span class="cx" style="display: block; padding: 0 10px">                $actual_result             = WP_Community_Events::get_unsafe_client_ip();

</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->assertEquals( $expected_result, $actual_result );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_result, $actual_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="trunktestsphpunittestsadminincludesFilephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesFile.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesFile.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/admin/includesFile.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,19 +13,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $home    = get_option( 'home' );

</span><span class="cx" style="display: block; padding: 0 10px">                $siteurl = get_option( 'siteurl' );

</span><span class="cx" style="display: block; padding: 0 10px">                $sfn     = $_SERVER['SCRIPT_FILENAME'];

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( str_replace( '\\', '/', ABSPATH ), get_home_path() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( str_replace( '\\', '/', ABSPATH ), get_home_path() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'home', 'http://localhost' );

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'siteurl', 'http://localhost/wp' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['SCRIPT_FILENAME'] = 'D:\root\vhosts\site\httpdocs\wp\wp-admin\options-permalink.php';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'D:/root/vhosts/site/httpdocs/', get_home_path() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'D:/root/vhosts/site/httpdocs/', get_home_path() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['SCRIPT_FILENAME'] = '/Users/foo/public_html/trunk/wp/wp-admin/options-permalink.php';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/Users/foo/public_html/trunk/', get_home_path() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/Users/foo/public_html/trunk/', get_home_path() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['SCRIPT_FILENAME'] = 'S:/home/wordpress/trunk/wp/wp-admin/options-permalink.php';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'S:/home/wordpress/trunk/', get_home_path() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'S:/home/wordpress/trunk/', get_home_path() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'home', $home );

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'siteurl', $siteurl );

</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">                $error = download_url( 'test_download_url_non_200' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'code' => 418,

</span><span class="cx" style="display: block; padding: 0 10px">                                'body' => 'This is an unexpected error message from your favorite server.',

</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">                $error = download_url( 'test_download_url_non_200' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'code' => 418,

</span><span class="cx" style="display: block; padding: 0 10px">                                'body' => 'This ',

</span></span></pre></div>

<a id="trunktestsphpunittestsadminincludesMiscphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesMisc.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesMisc.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/admin/includesMisc.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                => 'wordpress.org/about/philosophy/#&hellip;', // Shorten to 32 if > 35 after cleaning.

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $tests as $k => $v ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $v, url_shorten( $k ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $v, url_shorten( $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></pre></div>

<a id="trunktestsphpunittestsadminincludesPluginphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesPlugin.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPlugin.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/admin/includesPlugin.php  2020-09-02 00:35:36 UTC (rev 48937)

</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">                foreach ( $default_headers as $name => $value ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( isset( $data[ $name ] ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value, $data[ $name ] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $value, $data[ $name ] );

</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">@@ -51,7 +51,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected['testpages']           = 'http://example.com/wp-admin/edit.php?post_type=page&#038;page=testpages';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $expected as $name => $value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value, menu_page_url( $name, false ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $value, menu_page_url( $name, false ) );

</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">                wp_set_current_user( $current_user );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,7 +349,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_plugin_files_single() {

</span><span class="cx" style="display: block; padding: 0 10px">                $name = 'hello.php';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $name ), get_plugin_files( $name ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $name ), get_plugin_files( $name ) );

</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">@@ -369,7 +369,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'list_files_test_plugin/list_files_test_plugin.php',

</span><span class="cx" style="display: block; padding: 0 10px">                        'list_files_test_plugin/subdir/subfile.php',

</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->assertEquals( $expected, $plugin_files );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $plugin_files );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                unlink( $sub_dir . '/subfile.php' );

</span><span class="cx" style="display: block; padding: 0 10px">                unlink( $plugin[1] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,7 +389,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        mkdir( WPMU_PLUGIN_DIR );

</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->assertEquals( array(), get_mu_plugins() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), get_mu_plugins() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Clean up.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $exists ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -410,7 +410,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        rmdir( WPMU_PLUGIN_DIR );

</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->assertEquals( array(), get_mu_plugins() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), get_mu_plugins() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Clean up.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $exists ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,7 +432,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->_create_plugin( '<?php\n//Silence is golden.', 'index.php', WPMU_PLUGIN_DIR );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array(), get_mu_plugins() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), get_mu_plugins() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Clean up.

</span><span class="cx" style="display: block; padding: 0 10px">                unlink( WPMU_PLUGIN_DIR . '/index.php' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -457,7 +457,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_create_plugin( '<?php\n//Silence is not golden.', 'index.php', WPMU_PLUGIN_DIR );

</span><span class="cx" style="display: block; padding: 0 10px">                $found = get_mu_plugins();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( 'index.php' ), array_keys( $found ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'index.php' ), array_keys( $found ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Clean up.

</span><span class="cx" style="display: block; padding: 0 10px">                unlink( WPMU_PLUGIN_DIR . '/index.php' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -483,7 +483,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_create_plugin( '<?php\n//Test', 'foo.php', WPMU_PLUGIN_DIR );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_create_plugin( '<?php\n//Test 2', 'bar.txt', WPMU_PLUGIN_DIR );

</span><span class="cx" style="display: block; padding: 0 10px">                $found = get_mu_plugins();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( 'foo.php' ), array_keys( $found ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'foo.php' ), array_keys( $found ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Clean up.

</span><span class="cx" style="display: block; padding: 0 10px">                unlink( WPMU_PLUGIN_DIR . '/foo.php' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,7 +501,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test__sort_uname_callback() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertLessThan( 0, _sort_uname_callback( array( 'Name' => 'a' ), array( 'Name' => 'b' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertGreaterThan( 0, _sort_uname_callback( array( 'Name' => 'c' ), array( 'Name' => 'b' ) ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 0, _sort_uname_callback( array( 'Name' => 'a' ), array( 'Name' => 'a' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, _sort_uname_callback( array( 'Name' => 'a' ), array( 'Name' => 'a' ) ) );

</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">@@ -510,7 +510,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_dropins_empty() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_back_up_drop_ins();

</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->assertEquals( array(), get_dropins() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), get_dropins() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Clean up.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_restore_drop_ins();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -526,7 +526,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $p2 = $this->_create_plugin( "<?php\n//Test", 'not-a-dropin.php', WP_CONTENT_DIR );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $dropins = get_dropins();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( 'advanced-cache.php' ), array_keys( $dropins ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'advanced-cache.php' ), array_keys( $dropins ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                unlink( $p1[1] );

</span><span class="cx" style="display: block; padding: 0 10px">                unlink( $p2[1] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,7 +590,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @covers ::validate_active_plugins

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_validate_active_plugins_empty() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array(), validate_active_plugins() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), validate_active_plugins() );

</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="trunktestsphpunittestsadminincludesPostphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesPost.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPost.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/admin/includesPost.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,8 +37,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_results = _wp_translate_postdata( false, $_post_data );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $_results );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );

-               $this->assertEquals( 'draft', $_results['post_status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $_post_data['post_author'], $_results['post_author'] );

+               $this->assertSame( 'draft', $_results['post_status'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Submit post for approval.

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data                = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,8 +48,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_results = _wp_translate_postdata( false, $_post_data );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $_results );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );

-               $this->assertEquals( 'pending', $_results['post_status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $_post_data['post_author'], $_results['post_author'] );

+               $this->assertSame( 'pending', $_results['post_status'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Create new draft post for another user.

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data                = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,8 +59,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_results = _wp_translate_postdata( false, $_post_data );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $_results );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'edit_others_posts', $_results->get_error_code() );

-               $this->assertEquals( 'Sorry, you are not allowed to create posts as this user.', $_results->get_error_message() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'edit_others_posts', $_results->get_error_code() );

+               $this->assertSame( 'Sorry, you are not allowed to create posts as this user.', $_results->get_error_message() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Edit draft post for another user.

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data                = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,8 +72,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_results = _wp_translate_postdata( true, $_post_data );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $_results );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'edit_others_posts', $_results->get_error_code() );

-               $this->assertEquals( 'Sorry, you are not allowed to edit posts as this user.', $_results->get_error_message() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'edit_others_posts', $_results->get_error_code() );

+               $this->assertSame( 'Sorry, you are not allowed to edit posts as this user.', $_results->get_error_message() );

</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__wp_translate_postdata_cap_checks_editor() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,8 +87,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_results = _wp_translate_postdata( false, $_post_data );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $_results );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );

-               $this->assertEquals( 'draft', $_results['post_status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $_post_data['post_author'], $_results['post_author'] );

+               $this->assertSame( 'draft', $_results['post_status'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Publish post.

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data                = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,8 +98,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_results = _wp_translate_postdata( false, $_post_data );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $_results );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );

-               $this->assertEquals( 'publish', $_results['post_status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $_post_data['post_author'], $_results['post_author'] );

+               $this->assertSame( 'publish', $_results['post_status'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Create new draft post for another user.

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data                = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,8 +109,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_results = _wp_translate_postdata( false, $_post_data );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $_results );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );

-               $this->assertEquals( 'draft', $_results['post_status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $_post_data['post_author'], $_results['post_author'] );

+               $this->assertSame( 'draft', $_results['post_status'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Edit draft post for another user.

</span><span class="cx" style="display: block; padding: 0 10px">                $_post_data                = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,8 +122,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_results = _wp_translate_postdata( true, $_post_data );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $_results );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );

-               $this->assertEquals( 'draft', $_results['post_status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $_post_data['post_author'], $_results['post_author'] );

+               $this->assertSame( 'draft', $_results['post_status'] );

</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">@@ -134,7 +134,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_edit_post_auto_draft() {

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$editor_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $post = self::factory()->post->create_and_get( array( 'post_status' => 'auto-draft' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'auto-draft', $post->post_status );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'auto-draft', $post->post_status );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_data = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_title' => 'Post title',

</span><span class="cx" style="display: block; padding: 0 10px">                        'content'    => 'Post content',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'post_ID'    => $post->ID,

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                edit_post( $post_data );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'draft', get_post( $post->ID )->post_status );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'draft', get_post( $post->ID )->post_status );

</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">@@ -252,10 +252,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post = get_post( $post2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check that the first post's values don't stomp the second post.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'draft', $post->post_status );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'draft', $post->post_status );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( self::$author_ids[1], $post->post_author );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'closed', $post->comment_status );

-               $this->assertEquals( 'closed', $post->ping_status );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'closed', $post->comment_status );

+               $this->assertSame( 'closed', $post->ping_status );

</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">@@ -314,7 +314,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function check_post_format( $post_id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( self::$post_id === $post_id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 'aside', get_post_format( $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'aside', get_post_format( $post_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">@@ -538,7 +538,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">                $found = get_sample_permalink( $p );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '2015-2', $found[1] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '2015-2', $found[1] );

</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">@@ -554,7 +554,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">                $found = get_sample_permalink( $p );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '2015', $found[1] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '2015', $found[1] );

</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">@@ -570,7 +570,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">                $found = get_sample_permalink( $p );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '11-2', $found[1] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '11-2', $found[1] );

</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">@@ -586,7 +586,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">                $found = get_sample_permalink( $p );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '13', $found[1] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '13', $found[1] );

</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">@@ -602,7 +602,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">                $found = get_sample_permalink( $p );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '30-2', $found[1] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '30-2', $found[1] );

</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">@@ -624,7 +624,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">                $found = get_sample_permalink( $p );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '30-3', $found[1] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '30-3', $found[1] );

</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">@@ -640,7 +640,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">                $found = get_sample_permalink( $p );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '32', $found[1] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '32', $found[1] );

</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">@@ -656,7 +656,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">                $found = get_sample_permalink( $p );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '30', $found[1] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '30', $found[1] );

</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">@@ -825,8 +825,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_block_editor_server_block_settings() {

</span><span class="cx" style="display: block; padding: 0 10px">                $name     = 'core/test';

</span><span class="cx" style="display: block; padding: 0 10px">                $settings = array(

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        'icon'            => 'text',

</ins><span class="cx" style="display: block; padding: 0 10px">                         'category'        => 'common',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'icon'            => 'text',

</del><span class="cx" style="display: block; padding: 0 10px">                         'render_callback' => 'foo',

</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">@@ -837,12 +837,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                unregister_block_type( $name );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( $name, $blocks );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'title'       => '',

</span><span class="cx" style="display: block; padding: 0 10px">                                'description' => '',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'icon'        => 'text',

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'category'    => 'common',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'icon'        => 'text',

</del><span class="cx" style="display: block; padding: 0 10px">                                 'keywords'    => array(),

</span><span class="cx" style="display: block; padding: 0 10px">                                'usesContext' => array(),

</span><span class="cx" style="display: block; padding: 0 10px">                                'styles'      => array(),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -865,7 +865,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$admin_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotFalse( add_meta( $p ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', get_post_meta( $p, 'testkey', true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', get_post_meta( $p, 'testkey', true ) );

</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="trunktestsphpunittestsadminincludesSchemaphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesSchema.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesSchema.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/admin/includesSchema.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->options = $orig_options;

</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->assertEquals( $expected, $results );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $results );

</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 data_populate_options() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,8 +119,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                array(),

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

<span class="cx" style="display: block; padding: 0 10px">                                        // Random options to check.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'posts_per_rss'    => 10,

-                                       'rss_use_excerpt'  => 0,

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'posts_per_rss'    => '10',

+                                       'rss_use_excerpt'  => '0',

</ins><span class="cx" style="display: block; padding: 0 10px">                                         'mailserver_url'   => 'mail.example.com',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'mailserver_login' => 'login@example.com',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'mailserver_pass'  => 'password',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,13 +128,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'posts_per_rss'   => 7,

-                                       'rss_use_excerpt' => 1,

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'posts_per_rss'   => '7',

+                                       'rss_use_excerpt' => '1',

</ins><span class="cx" style="display: block; padding: 0 10px">                                 ),

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

<span class="cx" style="display: block; padding: 0 10px">                                        // Random options to check.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'posts_per_rss'    => 7,

-                                       'rss_use_excerpt'  => 1,

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'posts_per_rss'    => '7',

+                                       'rss_use_excerpt'  => '1',

</ins><span class="cx" style="display: block; padding: 0 10px">                                         'mailserver_url'   => 'mail.example.com',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'mailserver_login' => 'login@example.com',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'mailserver_pass'  => 'password',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,8 +147,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

<span class="cx" style="display: block; padding: 0 10px">                                        // Random options to check.

</span><span class="cx" style="display: block; padding: 0 10px">                                        'custom_option'    => '1',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'posts_per_rss'    => 10,

-                                       'rss_use_excerpt'  => 0,

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'posts_per_rss'    => '10',

+                                       'rss_use_excerpt'  => '0',

</ins><span class="cx" style="display: block; padding: 0 10px">                                         'mailserver_url'   => 'mail.example.com',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'mailserver_login' => 'login@example.com',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'mailserver_pass'  => 'password',

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->blogmeta = $orig_blogmeta;

</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->assertEquals( $expected, $results );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $results );

</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 data_populate_site_meta() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +248,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->sitemeta = $orig_sitemeta;

</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->assertEquals( $expected, $results );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $results );

</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 data_populate_network_meta() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,8 +258,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

<span class="cx" style="display: block; padding: 0 10px">                                        // Random meta to check.

</span><span class="cx" style="display: block; padding: 0 10px">                                        'registration'      => 'none',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'blog_upload_space' => 100,

-                                       'fileupload_maxk'   => 1500,

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'blog_upload_space' => '100',

+                                       'fileupload_maxk'   => '1500',

</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">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,8 +271,8 @@

<span class="cx" style="display: block; padding: 0 10px">                                        // Random meta to check.

</span><span class="cx" style="display: block; padding: 0 10px">                                        'site_name'         => 'My Great Network',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'registration'      => 'none',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'blog_upload_space' => 100,

-                                       'fileupload_maxk'   => 1500,

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'blog_upload_space' => '100',

+                                       'fileupload_maxk'   => '1500',

</ins><span class="cx" style="display: block; padding: 0 10px">                                         'WPLANG'            => 'fr_FR',

</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">@@ -284,8 +284,8 @@

<span class="cx" style="display: block; padding: 0 10px">                                        // Random meta to check.

</span><span class="cx" style="display: block; padding: 0 10px">                                        'custom_meta'       => '1',

</span><span class="cx" style="display: block; padding: 0 10px">                                        'registration'      => 'none',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'blog_upload_space' => 100,

-                                       'fileupload_maxk'   => 1500,

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'blog_upload_space' => '100',

+                                       'fileupload_maxk'   => '1500',

</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="trunktestsphpunittestsadminincludesScreenphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesScreen.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesScreen.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/admin/includesScreen.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,18 +203,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $GLOBALS['hook_suffix'] = $hook['path'];

</span><span class="cx" style="display: block; padding: 0 10px">                        set_current_screen();

</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->assertEquals( $screen->id, $current_screen->id, $hook_name );

-                       $this->assertEquals( $screen->base, $current_screen->base, $hook_name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $screen->id, $current_screen->id, $hook_name );

+                       $this->assertSame( $screen->base, $current_screen->base, $hook_name );

</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( isset( $screen->action ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $this->assertEquals( $screen->action, $current_screen->action, $hook_name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $this->assertSame( $screen->action, $current_screen->action, $hook_name );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $screen->post_type ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $this->assertEquals( $screen->post_type, $current_screen->post_type, $hook_name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $this->assertSame( $screen->post_type, $current_screen->post_type, $hook_name );

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else {

</span><span class="cx" style="display: block; padding: 0 10px">                                $this->assertEmpty( $current_screen->post_type, $hook_name );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $screen->taxonomy ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $this->assertEquals( $screen->taxonomy, $current_screen->taxonomy, $hook_name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $this->assertSame( $screen->taxonomy, $current_screen->taxonomy, $hook_name );

</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->assertTrue( $current_screen->in_admin() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,9 +237,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_post_type_as_hookname() {

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = convert_to_screen( 'page' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->post_type, 'page' );

-               $this->assertEquals( $screen->base, 'post' );

-               $this->assertEquals( $screen->id, 'page' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->post_type, 'page' );

+               $this->assertSame( $screen->base, 'post' );

+               $this->assertSame( $screen->id, 'page' );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $screen->is_block_editor );

</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">@@ -246,15 +246,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_post_type_with_special_suffix_as_hookname() {

</span><span class="cx" style="display: block; padding: 0 10px">                register_post_type( 'value-add' );

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = convert_to_screen( 'value-add' ); // The '-add' part is key.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->post_type, 'value-add' );

-               $this->assertEquals( $screen->base, 'post' );

-               $this->assertEquals( $screen->id, 'value-add' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->post_type, 'value-add' );

+               $this->assertSame( $screen->base, 'post' );

+               $this->assertSame( $screen->id, 'value-add' );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $screen->is_block_editor ); // Post types do not support `show_in_rest` by default.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = convert_to_screen( 'edit-value-add' ); // The '-add' part is key.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->post_type, 'value-add' );

-               $this->assertEquals( $screen->base, 'edit' );

-               $this->assertEquals( $screen->id, 'edit-value-add' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->post_type, 'value-add' );

+               $this->assertSame( $screen->base, 'edit' );

+               $this->assertSame( $screen->id, 'edit-value-add' );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $screen->is_block_editor ); // Post types do not support `show_in_rest` by default.

</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">@@ -261,9 +261,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_taxonomy_with_special_suffix_as_hookname() {

</span><span class="cx" style="display: block; padding: 0 10px">                register_taxonomy( 'old-or-new', 'post' );

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = convert_to_screen( 'edit-old-or-new' ); // The '-new' part is key.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->taxonomy, 'old-or-new' );

-               $this->assertEquals( $screen->base, 'edit-tags' );

-               $this->assertEquals( $screen->id, 'edit-old-or-new' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->taxonomy, 'old-or-new' );

+               $this->assertSame( $screen->base, 'edit-tags' );

+               $this->assertSame( $screen->id, 'edit-old-or-new' );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $screen->is_block_editor );

</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">@@ -270,15 +270,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_post_type_with_edit_prefix() {

</span><span class="cx" style="display: block; padding: 0 10px">                register_post_type( 'edit-some-thing' );

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = convert_to_screen( 'edit-some-thing' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->post_type, 'edit-some-thing' );

-               $this->assertEquals( $screen->base, 'post' );

-               $this->assertEquals( $screen->id, 'edit-some-thing' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->post_type, 'edit-some-thing' );

+               $this->assertSame( $screen->base, 'post' );

+               $this->assertSame( $screen->id, 'edit-some-thing' );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $screen->is_block_editor ); // Post types do not support `show_in_rest` by default.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = convert_to_screen( 'edit-edit-some-thing' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->post_type, 'edit-some-thing' );

-               $this->assertEquals( $screen->base, 'edit' );

-               $this->assertEquals( $screen->id, 'edit-edit-some-thing' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->post_type, 'edit-some-thing' );

+               $this->assertSame( $screen->base, 'edit' );

+               $this->assertSame( $screen->id, 'edit-edit-some-thing' );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $screen->is_block_editor ); // Post types do not support `show_in_rest` by default.

</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">@@ -288,25 +288,25 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Sorry, core wins here.

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = convert_to_screen( 'edit-comments' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->base, 'edit-comments' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->base, 'edit-comments' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // The post type wins here. convert_to_screen( $post_type ) is only relevant for meta boxes anyway.

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = convert_to_screen( 'comments' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->base, 'post' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->base, 'post' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Core wins.

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = convert_to_screen( 'edit-tags' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->base, 'edit-tags' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->base, 'edit-tags' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = convert_to_screen( 'tags' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->base, 'post' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->base, 'post' );

</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_help_tabs() {

</span><span class="cx" style="display: block; padding: 0 10px">                $tab      = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $tab_args = array(

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        'title'    => 'Help!',

</ins><span class="cx" style="display: block; padding: 0 10px">                         'id'       => $tab,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'title'    => 'Help!',

</del><span class="cx" style="display: block; padding: 0 10px">                         'content'  => 'Some content',

</span><span class="cx" style="display: block; padding: 0 10px">                        'callback' => false,

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,11 +313,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = get_current_screen();

</span><span class="cx" style="display: block; padding: 0 10px">                $screen->add_help_tab( $tab_args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $screen->get_help_tab( $tab ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'title'    => 'Help!',

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'id'       => $tab,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'title'    => 'Help!',

</del><span class="cx" style="display: block; padding: 0 10px">                                 'content'  => 'Some content',

</span><span class="cx" style="display: block; padding: 0 10px">                                'callback' => false,

</span><span class="cx" style="display: block; padding: 0 10px">                                'priority' => 10,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +331,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $screen->get_help_tab( $tab ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen->remove_help_tabs();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->get_help_tabs(), array() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->get_help_tabs(), array() );

</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">@@ -380,18 +380,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertequals( $screen->get_help_tab( $tab_1 ), $tab_1_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen->add_help_tab( $tab_2_args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->get_help_tab( $tab_2 ), $tab_2_args );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->get_help_tab( $tab_2 ), $tab_2_args );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen->add_help_tab( $tab_3_args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->get_help_tab( $tab_3 ), $tab_3_args );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->get_help_tab( $tab_3 ), $tab_3_args );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen->add_help_tab( $tab_4_args );

<span class="cx" style="display: block; padding: 0 10px">                // Priority is added with the default for future calls.

</span><span class="cx" style="display: block; padding: 0 10px">                $tab_4_args['priority'] = 10;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->get_help_tab( $tab_4 ), $tab_4_args );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->get_help_tab( $tab_4 ), $tab_4_args );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $tabs = $screen->get_help_tabs();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 4, count( $tabs ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 4, count( $tabs ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( $tab_1, $tabs );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( $tab_2, $tabs );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( $tab_3, $tabs );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,7 +426,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 0, count( $screen->get_help_tabs() ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen->remove_help_tabs();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array(), $screen->get_help_tabs() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), $screen->get_help_tabs() );

</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">@@ -443,7 +443,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $screen = get_current_screen();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen->add_option( $option, $option_args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->get_option( $option ), $option_args );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->get_option( $option ), $option_args );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $options = $screen->get_options();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( $option, $options );

</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">                $this->assertNull( $screen->get_option( $option ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $screen->remove_options();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $screen->get_options(), array() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $screen->get_options(), array() );

</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_in_admin() {

</span></span></pre></div>

<a id="trunktestsphpunittestsadminincludesThemephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesTheme.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesTheme.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/admin/includesTheme.php   2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        get_page_templates( null, '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->assertEquals( array(), get_page_templates( null, 'bar' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), get_page_templates( null, '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">@@ -166,7 +166,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        get_page_templates()

</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->assertEquals( array(), get_page_templates( null, 'bar' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), get_page_templates( null, '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></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    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/adminbar.php      2020-09-02 00:35:36 UTC (rev 48937)

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $nodes = $admin_bar->get_nodes();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $nodes['new-content']->parent );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'new-content', $nodes['add-new-content']->parent );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'new-content', $nodes['add-new-content']->parent );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                _unregister_post_type( 'content' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,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">                $node1 = $admin_bar->get_node( 'test-node' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( 'class' => 'test-class' ), $node1->meta );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'class' => 'test-class' ), $node1->meta );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $admin_bar->add_node(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,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">                $node2 = $admin_bar->get_node( 'test-node' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'class'     => 'test-class',

</span><span class="cx" style="display: block; padding: 0 10px">                                'some-meta' => 'value',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $node_edit_profile = $wp_admin_bar->get_node( 'edit-profile' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Site menu points to the home page instead of the admin URL.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( home_url( '/' ), $node_site_name->href );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( home_url( '/' ), $node_site_name->href );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // No profile links as the user doesn't have any permissions on the site.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $node_my_account->href );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,14 +125,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $node_edit_profile = $wp_admin_bar->get_node( 'edit-profile' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Site menu points to the admin URL.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( admin_url( '/' ), $node_site_name->href );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( admin_url( '/' ), $node_site_name->href );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $profile_url = admin_url( 'profile.php' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Profile URLs point to profile.php.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $profile_url, $node_my_account->href );

-               $this->assertEquals( $profile_url, $node_user_info->href );

-               $this->assertEquals( $profile_url, $node_edit_profile->href );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $profile_url, $node_my_account->href );

+               $this->assertSame( $profile_url, $node_user_info->href );

+               $this->assertSame( $profile_url, $node_edit_profile->href );

</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">@@ -177,9 +177,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $primary_profile_url, admin_url( 'profile.php' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Profile URLs should go to the user's primary blog.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $primary_profile_url, $node_my_account->href );

-               $this->assertEquals( $primary_profile_url, $node_user_info->href );

-               $this->assertEquals( $primary_profile_url, $node_edit_profile->href );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $primary_profile_url, $node_my_account->href );

+               $this->assertSame( $primary_profile_url, $node_user_info->href );

+               $this->assertSame( $primary_profile_url, $node_edit_profile->href );

</ins><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="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,9 +232,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $user_profile_url, admin_url( 'profile.php' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Profile URLs should go to the user's primary blog.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $user_profile_url, $node_my_account->href );

-               $this->assertEquals( $user_profile_url, $node_user_info->href );

-               $this->assertEquals( $user_profile_url, $node_edit_profile->href );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $user_profile_url, $node_my_account->href );

+               $this->assertSame( $user_profile_url, $node_user_info->href );

+               $this->assertSame( $user_profile_url, $node_edit_profile->href );

</ins><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="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -463,7 +463,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $about_node   = $wp_admin_bar->get_node( 'about' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotNull( $wp_logo_node );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( false, $wp_logo_node->href );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( $wp_logo_node->href );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'tabindex', $wp_logo_node->meta );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 0, $wp_logo_node->meta['tabindex'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $about_node );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -687,7 +687,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $parsed_url   = wp_parse_url( $node->href );

</span><span class="cx" style="display: block; padding: 0 10px">                $query_params = array();

</span><span class="cx" style="display: block; padding: 0 10px">                wp_parse_str( $parsed_url['query'], $query_params );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $uuid, $query_params['changeset_uuid'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $uuid, $query_params['changeset_uuid'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotContains( 'changeset_uuid', $query_params['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="trunktestsphpunittestsajaxAddMetaphp"></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/AddMeta.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/AddMeta.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/ajax/AddMeta.php  2020-09-02 00:35:36 UTC (rev 48937)

</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">                        unset( $e );

</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->assertEquals( '', get_post_meta( $p, 'testkey', true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', get_post_meta( $p, 'testkey', true ) );

</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">@@ -66,6 +66,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $e );

</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->assertEquals( '', get_post_meta( $p, 'testkey', true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', get_post_meta( $p, 'testkey', true ) );

</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="trunktestsphpunittestsajaxAttachmentsphp"></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/Attachments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/Attachments.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/ajax/Attachments.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure everything is correct.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $response['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $response['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $response['data'] );

</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">@@ -111,6 +111,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure everything is correct.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $response['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $response['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $response['data'] );

</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="trunktestsphpunittestsajaxCompressionphp"></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/Compression.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/Compression.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/ajax/Compression.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check the site option is not changed due to lack of nonce.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 0, get_site_option( 'can_compress_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, get_site_option( 'can_compress_scripts' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Add a nonce.

</span><span class="cx" style="display: block; padding: 0 10px">                $_GET['_ajax_nonce'] = wp_create_nonce( 'update_can_compress_scripts' );

</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 class="cx" style="display: block; padding: 0 10px">                // Check the site option is changed.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, get_site_option( 'can_compress_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, get_site_option( 'can_compress_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +182,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check the site option is not changed due to lack of nonce.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, get_site_option( 'can_compress_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, get_site_option( 'can_compress_scripts' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Add a nonce.

</span><span class="cx" style="display: block; padding: 0 10px">                $_GET['_ajax_nonce'] = wp_create_nonce( 'update_can_compress_scripts' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +195,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check the site option is changed.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 0, get_site_option( 'can_compress_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, get_site_option( 'can_compress_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">        /**

</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       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/ajax/CustomizeManager.php 2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'unauthenticated', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'unauthenticated', $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">                // Unauthorized.

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$subscriber_user_id );

</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">                $_REQUEST['nonce'] = $nonce;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'not_preview', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'not_preview', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Bad nonce.

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['nonce']    = 'bad';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize->setup_theme();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'invalid_nonce', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_nonce', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // User cannot create.

</span><span class="cx" style="display: block; padding: 0 10px">                $nonce                            = wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +161,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post_type_obj->cap->create_posts = 'create_customize_changesets';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'cannot_create_changeset_post', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'cannot_create_changeset_post', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->overridden_caps[ $post_type_obj->cap->create_posts ] = true;

</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><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">                $wp_customize->save_changeset_post( array( 'status' => 'publish' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'changeset_already_published', $this->_last_response_parsed['data']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'changeset_already_published', $this->_last_response_parsed['data']['code'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'ID'          => $wp_customize->changeset_post_id(),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +185,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post_type_obj->cap->edit_post = 'edit_customize_changesets';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'cannot_edit_changeset_post', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'cannot_edit_changeset_post', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->overridden_caps[ $post_type_obj->cap->edit_post ] = true;

</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +195,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['customize_changeset_data'] = '[MALFORMED]';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'invalid_customize_changeset_data', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_customize_changeset_data', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Bad customize_changeset_status.

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['customize_changeset_data']   = '{}';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['customize_changeset_status'] = 'unrecognized';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'bad_customize_changeset_status', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'bad_customize_changeset_status', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Disallowed publish posts if not allowed.

</span><span class="cx" style="display: block; padding: 0 10px">                $post_type_obj                       = get_post_type_object( 'customize_changeset' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,11 +210,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['customize_changeset_status'] = 'publish';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'changeset_publish_unauthorized', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'changeset_publish_unauthorized', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['customize_changeset_status'] = 'future';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'changeset_publish_unauthorized', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'changeset_publish_unauthorized', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_type_obj->cap->publish_posts = 'customize'; // Restore.

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Validate date.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,11 +222,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['customize_changeset_date']   = 'BAD DATE';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'bad_customize_changeset_date', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'bad_customize_changeset_date', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['customize_changeset_date'] = '2010-01-01 00:00:00';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'not_future_date', $this->_last_response_parsed['data']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'not_future_date', $this->_last_response_parsed['data']['code'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['customize_changeset_date'] = ( gmdate( 'Y' ) + 1 ) . '-01-01 00:00:00';

</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><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">                $_POST['customize_changeset_date']   = '+10 minutes';

</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->assertEquals( 'future', get_post_status( $wp_customize->changeset_post_id() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'future', get_post_status( $wp_customize->changeset_post_id() ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'ID'          => $wp_customize->changeset_post_id(),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,11 +288,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->_last_response_parsed['success'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $this->_last_response_parsed['data'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'publish', $this->_last_response_parsed['data']['changeset_status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'publish', $this->_last_response_parsed['data']['changeset_status'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'next_changeset_uuid', $this->_last_response_parsed['data'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( wp_is_uuid( $this->_last_response_parsed['data']['next_changeset_uuid'], 4 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Success Changeset', get_post( $wp_customize->changeset_post_id() )->post_title );

-               $this->assertEquals( 'Successful Site Title', get_option( 'blogname' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Success Changeset', get_post( $wp_customize->changeset_post_id() )->post_title );

+               $this->assertSame( 'Successful Site Title', get_option( 'blogname' ) );

</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">@@ -327,11 +327,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->_last_response_parsed['success'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $this->_last_response_parsed['data'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'publish', $this->_last_response_parsed['data']['changeset_status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'publish', $this->_last_response_parsed['data']['changeset_status'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'next_changeset_uuid', $this->_last_response_parsed['data'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( wp_is_uuid( $this->_last_response_parsed['data']['next_changeset_uuid'], 4 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'New Site Title', get_option( 'blogname' ) );

-               $this->assertEquals( 'Published', get_post( $post_id )->post_title );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'New Site Title', get_option( 'blogname' ) );

+               $this->assertSame( 'Published', get_post( $post_id )->post_title );

</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">@@ -368,7 +368,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->_last_response_parsed['success'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'changeset_date', $this->_last_response_parsed['data'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $changeset_post_schedule = get_post( $post_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $future_date, $changeset_post_schedule->post_date );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $future_date, $changeset_post_schedule->post_date );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Success future changeset change to draft keeping existing date.

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $_POST['customize_changeset_date'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,7 +377,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->_last_response_parsed['success'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayNotHasKey( 'changeset_date', $this->_last_response_parsed['data'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $changeset_post_draft = get_post( $post_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $future_date, $changeset_post_draft->post_date );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $future_date, $changeset_post_draft->post_date );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Success if date is not passed with schedule changeset and stored changeset have future date.

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['customize_changeset_status'] = 'future';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +385,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->_last_response_parsed['success'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'changeset_date', $this->_last_response_parsed['data'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $changeset_post_schedule = get_post( $post_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $future_date, $changeset_post_schedule->post_date );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $future_date, $changeset_post_schedule->post_date );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Success if draft with past date.

</span><span class="cx" style="display: block; padding: 0 10px">                $now = current_time( 'mysql' );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_post(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,7 +402,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $_POST['customize_changeset_date'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'not_future_date', $this->_last_response_parsed['data']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'not_future_date', $this->_last_response_parsed['data']['code'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Success publish changeset reset date to current.

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_post(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,11 +423,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $future_date, $changeset_post_publish->post_date );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check response when trying to update an already-published post.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'trash', get_post_status( $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'trash', get_post_status( $post_id ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $_POST['customize_changeset_status'] = 'publish';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_save' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'changeset_already_published', $this->_last_response_parsed['data']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'changeset_already_published', $this->_last_response_parsed['data']['code'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'next_changeset_uuid', $this->_last_response_parsed['data'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( wp_is_uuid( $this->_last_response_parsed['data']['next_changeset_uuid'], 4 ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,7 +470,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['customize_changeset_autosave'] = 'on';

</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->assertEquals( 'draft', $this->_last_response_parsed['data']['changeset_status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'draft', $this->_last_response_parsed['data']['changeset_status'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $autosave_revision = wp_get_post_autosave( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Post', $autosave_revision );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -490,7 +490,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_trash' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'invalid_nonce', $this->_last_response_parsed['data']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_nonce', $this->_last_response_parsed['data']['code'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $nonce             = wp_create_nonce( 'trash_customize_changeset' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['nonce']    = $nonce;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,7 +498,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_REQUEST['nonce'] = $nonce;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_trash' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'non_existent_changeset', $this->_last_response_parsed['data']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'non_existent_changeset', $this->_last_response_parsed['data']['code'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                $wp_customize->register_controls(); // And settings too.

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize->set_post_value( 'blogname', 'HELLO' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,7 +511,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'map_meta_cap', array( $this, 'return_do_not_allow' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_trash' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'changeset_trash_unauthorized', $this->_last_response_parsed['data']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'changeset_trash_unauthorized', $this->_last_response_parsed['data']['code'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'map_meta_cap', array( $this, 'return_do_not_allow' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $lock_user_id  = static::factory()->user->create( array( 'role' => 'administrator' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,7 +521,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( $previous_user );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_trash' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'changeset_locked', $this->_last_response_parsed['data']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'changeset_locked', $this->_last_response_parsed['data']['code'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 delete_post_meta( $wp_customize->changeset_post_id(), '_edit_lock' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_post(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -532,7 +532,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_trash' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'changeset_already_trashed', $this->_last_response_parsed['data']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'changeset_already_trashed', $this->_last_response_parsed['data']['code'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,16 +545,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'pre_trash_post', '__return_false' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_trash' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'changeset_trash_failure', $this->_last_response_parsed['data']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'changeset_trash_failure', $this->_last_response_parsed['data']['code'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'pre_trash_post', '__return_false' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $wp_trash_post_count, did_action( 'wp_trash_post' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $wp_trash_post_count, did_action( 'wp_trash_post' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_trash_post_count = did_action( 'wp_trash_post' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'draft', get_post_status( $wp_customize->changeset_post_id() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'draft', get_post_status( $wp_customize->changeset_post_id() ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->make_ajax_call( 'customize_trash' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'trash', get_post_status( $wp_customize->changeset_post_id() ) );

-               $this->assertEquals( $wp_trash_post_count + 1, did_action( 'wp_trash_post' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'trash', get_post_status( $wp_customize->changeset_post_id() ) );

+               $this->assertSame( $wp_trash_post_count + 1, did_action( 'wp_trash_post' ) );

</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">@@ -582,12 +582,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_dismiss_autosave_or_lock' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'unauthenticated', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'unauthenticated', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( $valid_user_id );

</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_dismiss_autosave_or_lock' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'invalid_nonce', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_nonce', $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">                $nonce             = wp_create_nonce( 'customize_dismiss_autosave_or_lock' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['nonce']    = $nonce;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,7 +599,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_REQUEST['dismiss_lock'] = true;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_dismiss_autosave_or_lock' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'no_changeset_to_dismiss_lock', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'no_changeset_to_dismiss_lock', $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">                $_POST['dismiss_autosave']    = true;

</span><span class="cx" style="display: block; padding: 0 10px">                $_GET['dismiss_autosave']     = true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -606,7 +606,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_REQUEST['dismiss_autosave'] = true;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_dismiss_autosave_or_lock' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'no_auto_draft_to_delete', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'no_auto_draft_to_delete', $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">                $other_user_id = $this->factory()->user->create();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -640,13 +640,13 @@

</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_dismiss_autosave_or_lock' );

</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->assertEquals( 'auto_draft_dismissed', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'auto_draft_dismissed', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $user_auto_draft_ids as $post_id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 'auto-draft', get_post_status( $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'auto-draft', get_post_status( $post_id ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( (bool) get_post_meta( $post_id, '_customize_restore_dismissed', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $other_user_auto_draft_ids as $post_id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 'auto-draft', get_post_status( $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'auto-draft', get_post_status( $post_id ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( (bool) get_post_meta( $post_id, '_customize_restore_dismissed', true ) );

</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">@@ -653,7 +653,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Subsequent test results in none dismissed.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_dismiss_autosave_or_lock' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'no_auto_draft_to_delete', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'no_auto_draft_to_delete', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Save a changeset as a draft.

</span><span class="cx" style="display: block; padding: 0 10px">                $r = $wp_customize->save_changeset_post(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -672,7 +672,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_REQUEST['dismiss_autosave'] = false;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_dismiss_autosave_or_lock' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'changeset_lock_dismissed', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'changeset_lock_dismissed', $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">                $_POST['dismiss_autosave']    = true;

</span><span class="cx" style="display: block; padding: 0 10px">                $_GET['dismiss_autosave']     = true;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -684,7 +684,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Since no autosave yet, confirm no action.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_dismiss_autosave_or_lock' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'no_autosave_revision_to_delete', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'no_autosave_revision_to_delete', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Add the autosave revision.

</span><span class="cx" style="display: block; padding: 0 10px">                $r = $wp_customize->save_changeset_post(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -706,12 +706,12 @@

<span class="cx" style="display: block; padding: 0 10px">                // Confirm autosave gets deleted.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_dismiss_autosave_or_lock' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'autosave_revision_deleted', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'autosave_revision_deleted', $this->_last_response_parsed['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( wp_get_post_autosave( $wp_customize->changeset_post_id() ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Since no autosave yet, confirm no action.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize_dismiss_autosave_or_lock' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->_last_response_parsed['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'no_autosave_revision_to_delete', $this->_last_response_parsed['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'no_autosave_revision_to_delete', $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"> }

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxCustomizeMenusphp"></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/CustomizeMenus.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/CustomizeMenus.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/ajax/CustomizeMenus.php   2020-09-02 00:35:36 UTC (rev 48937)

</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">                $response = json_decode( $this->_last_response, true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $post_args['search'] ) && 'test' === $post_args['search'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertsame( true, $response['success'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertTrue( $response['success'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertSame( 6, count( $response['data']['items'] ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $item_ids = wp_list_pluck( $response['data']['items'], 'id' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertContains( 'post-' . $included_auto_draft_post->ID, $item_ids );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,11 +628,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'post_id', $response['data'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'url', $response['data'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $post = get_post( $response['data']['post_id'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Hello World', $post->post_title );

-               $this->assertEquals( 'post', $post->post_type );

-               $this->assertEquals( '', $post->post_name );

-               $this->assertEquals( 'hello-world', get_post_meta( $post->ID, '_customize_draft_post_name', true ) );

-               $this->assertEquals( $this->wp_customize->changeset_uuid(), get_post_meta( $post->ID, '_customize_changeset_uuid', true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Hello World', $post->post_title );

+               $this->assertSame( 'post', $post->post_type );

+               $this->assertSame( '', $post->post_name );

+               $this->assertSame( 'hello-world', get_post_meta( $post->ID, '_customize_draft_post_name', true ) );

+               $this->assertSame( $this->wp_customize->changeset_uuid(), get_post_meta( $post->ID, '_customize_changeset_uuid', true ) );

</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">@@ -647,7 +647,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize-nav-menus-insert-auto-draft' );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = json_decode( $this->_last_response, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $response['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'bad_nonce', $response['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'bad_nonce', $response['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Bad nonce.

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST                = wp_slash(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -659,7 +659,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize-nav-menus-insert-auto-draft' );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = json_decode( $this->_last_response, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $response['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'bad_nonce', $response['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'bad_nonce', $response['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Bad nonce.

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( $this->factory()->user->create( array( 'role' => 'subscriber' ) ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -672,7 +672,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize-nav-menus-insert-auto-draft' );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = json_decode( $this->_last_response, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $response['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'customize_not_allowed', $response['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'customize_not_allowed', $response['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Missing params.

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,7 +685,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize-nav-menus-insert-auto-draft' );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = json_decode( $this->_last_response, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $response['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'missing_params', $response['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'missing_params', $response['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // insufficient_post_permissions.

</span><span class="cx" style="display: block; padding: 0 10px">                register_post_type( 'privilege', array( 'capability_type' => 'privilege' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -701,7 +701,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize-nav-menus-insert-auto-draft' );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = json_decode( $this->_last_response, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $response['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'insufficient_post_permissions', $response['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'insufficient_post_permissions', $response['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // insufficient_post_permissions.

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST                = wp_slash(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,7 +716,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize-nav-menus-insert-auto-draft' );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = json_decode( $this->_last_response, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $response['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'missing_post_type_param', $response['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'missing_post_type_param', $response['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // missing_post_title.

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST                = wp_slash(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -732,7 +732,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize-nav-menus-insert-auto-draft' );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = json_decode( $this->_last_response, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $response['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'missing_post_title', $response['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'missing_post_title', $response['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // illegal_params.

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST                = wp_slash(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -750,6 +750,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->make_ajax_call( 'customize-nav-menus-insert-auto-draft' );

</span><span class="cx" style="display: block; padding: 0 10px">                $response = json_decode( $this->_last_response, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $response['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'illegal_params', $response['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'illegal_params', $response['data'] );

</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="trunktestsphpunittestsajaxDeleteCommentphp"></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/DeleteComment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/DeleteComment.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/ajax/DeleteComment.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,8 +88,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure everything is correct.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $comment->comment_ID, (string) $xml->response[0]->comment['id'] );

-               $this->assertEquals( 'delete-comment_' . $comment->comment_ID, (string) $xml->response['action'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $comment->comment_ID, (string) $xml->response[0]->comment['id'] );

+               $this->assertSame( 'delete-comment_' . $comment->comment_ID, (string) $xml->response['action'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertGreaterThanOrEqual( time() - 10, (int) $xml->response[0]->comment[0]->supplemental[0]->time[0] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertLessThanOrEqual( time(), (int) $xml->response[0]->comment[0]->supplemental[0]->time[0] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->_handleAjax( 'delete-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->fail( 'Expected exception: WPAjaxDieStopException' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieStopException $e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 10, strlen( $e->getMessage() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 10, strlen( $e->getMessage() ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( is_numeric( $e->getMessage() ) );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( Exception $e ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->fail( 'Unexpected exception type: ' . get_class( $e ) );

</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">                        $this->_handleAjax( 'delete-comment' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->fail( 'Expected exception: WPAjaxDieStopException' );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPAjaxDieStopException $e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 10, strlen( $e->getMessage() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 10, strlen( $e->getMessage() ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( is_numeric( $e->getMessage() ) );

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( Exception $e ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->fail( 'Unexpected exception type: ' . get_class( $e ) );

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxDimCommentphp"></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/DimComment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/DimComment.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/ajax/DimComment.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,8 +82,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure everything is correct.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $comment->comment_ID, (string) $xml->response[0]->comment['id'] );

-               $this->assertEquals( 'dim-comment_' . $comment->comment_ID, (string) $xml->response['action'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $comment->comment_ID, (string) $xml->response[0]->comment['id'] );

+               $this->assertSame( 'dim-comment_' . $comment->comment_ID, (string) $xml->response['action'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertGreaterThanOrEqual( time() - 10, (int) $xml->response[0]->comment[0]->supplemental[0]->time[0] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertLessThanOrEqual( time(), (int) $xml->response[0]->comment[0]->supplemental[0]->time[0] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,9 +90,9 @@

<span class="cx" style="display: block; padding: 0 10px">                // Check the status.

</span><span class="cx" style="display: block; padding: 0 10px">                $current = wp_get_comment_status( $comment->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                if ( in_array( $prev_status, array( 'unapproved', 'spam' ), true ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 'approved', $current );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'approved', $current );

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 'unapproved', $current );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'unapproved', $current );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // The total is calculated based on a page break -OR- a random number. Let's look for both possible outcomes.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,8 +193,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Ensure everything is correct.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( '0', (string) $xml->response[0]->comment['id'] );

-                       $this->assertEquals( 'dim-comment_0', (string) $xml->response['action'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( '0', (string) $xml->response[0]->comment['id'] );

+                       $this->assertSame( 'dim-comment_0', (string) $xml->response['action'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertContains( 'Comment ' . $_POST['id'] . ' does not exist', $this->_last_response );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( Exception $e ) {

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxEditCommentphp"></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/EditComment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/EditComment.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/ajax/EditComment.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,9 +66,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check the meta data.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( -1, (string) $xml->response[0]->edit_comment['position'] );

-               $this->assertEquals( $comment->comment_ID, (string) $xml->response[0]->edit_comment['id'] );

-               $this->assertEquals( 'edit-comment_' . $comment->comment_ID, (string) $xml->response['action'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '-1', (string) $xml->response[0]->edit_comment['position'] );

+               $this->assertSame( $comment->comment_ID, (string) $xml->response[0]->edit_comment['id'] );

+               $this->assertSame( 'edit-comment_' . $comment->comment_ID, (string) $xml->response['action'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check the payload.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( (string) $xml->response[0]->edit_comment[0]->response_data );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,9 +114,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check the meta data.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( -1, (string) $xml->response[0]->edit_comment['position'] );

-               $this->assertEquals( $comment->comment_ID, (string) $xml->response[0]->edit_comment['id'] );

-               $this->assertEquals( 'edit-comment_' . $comment->comment_ID, (string) $xml->response['action'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '-1', (string) $xml->response[0]->edit_comment['position'] );

+               $this->assertSame( $comment->comment_ID, (string) $xml->response[0]->edit_comment['id'] );

+               $this->assertSame( 'edit-comment_' . $comment->comment_ID, (string) $xml->response['action'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check the payload.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( (string) $xml->response[0]->edit_comment[0]->response_data );

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxGetCommentsphp"></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/GetComments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/GetComments.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/ajax/GetComments.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,9 +63,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check the meta data.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, (string) $xml->response[0]->comments['position'] );

-               $this->assertEquals( 0, (string) $xml->response[0]->comments['id'] );

-               $this->assertEquals( 'get-comments_0', (string) $xml->response['action'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '1', (string) $xml->response[0]->comments['position'] );

+               $this->assertSame( '0', (string) $xml->response[0]->comments['id'] );

+               $this->assertSame( 'get-comments_0', (string) $xml->response['action'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check the payload.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( (string) $xml->response[0]->comments[0]->response_data );

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxReplytoCommentphp"></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/ReplytoComment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/ReplytoComment.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/ajax/ReplytoComment.php   2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $xml = simplexml_load_string( $this->_last_response, 'SimpleXMLElement', LIBXML_NOCDATA );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check the meta data.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( -1, (string) $xml->response[0]->comment['position'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '-1', (string) $xml->response[0]->comment['position'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertGreaterThan( 0, (int) $xml->response[0]->comment['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( (string) $xml->response['action'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxTagSearchphp"></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/TagSearch.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/TagSearch.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/ajax/TagSearch.php        2020-09-02 00:35:36 UTC (rev 48937)

</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">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure we found the right match.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->_last_response, 'chattels' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->_last_response, 'chattels' );

</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">@@ -98,7 +98,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure we found the right match.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->_last_response, 'chattels' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->_last_response, 'chattels' );

</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="trunktestsphpunittestsattachmentslashesphp"></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/attachment/slashes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/attachment/slashes.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/attachment/slashes.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,9 +37,9 @@

</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"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( wp_unslash( $this->slash_1 ), $post->post_title );

-               $this->assertEquals( wp_unslash( $this->slash_3 ), $post->post_content_filtered );

-               $this->assertEquals( wp_unslash( $this->slash_5 ), $post->post_excerpt );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( wp_unslash( $this->slash_1 ), $post->post_title );

+               $this->assertSame( wp_unslash( $this->slash_3 ), $post->post_content_filtered );

+               $this->assertSame( wp_unslash( $this->slash_5 ), $post->post_excerpt );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $id   = wp_insert_attachment(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,9 +52,9 @@

</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"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( wp_unslash( $this->slash_2 ), $post->post_title );

-               $this->assertEquals( wp_unslash( $this->slash_4 ), $post->post_content_filtered );

-               $this->assertEquals( wp_unslash( $this->slash_6 ), $post->post_excerpt );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( wp_unslash( $this->slash_2 ), $post->post_title );

+               $this->assertSame( wp_unslash( $this->slash_4 ), $post->post_content_filtered );

+               $this->assertSame( wp_unslash( $this->slash_6 ), $post->post_excerpt );

</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="trunktestsphpunittestsauthphp"></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/auth.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/auth.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/auth.php  2020-09-02 00:35:36 UTC (rev 48937)

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_auth_cookie_valid() {

</span><span class="cx" style="display: block; padding: 0 10px">                $cookie = wp_generate_auth_cookie( self::$user_id, time() + 3600, 'auth' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( self::$user_id, wp_validate_auth_cookie( $cookie, 'auth' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( self::$user_id, wp_validate_auth_cookie( $cookie, 'auth' ) );

</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_auth_cookie_invalid() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,25 +45,25 @@

<span class="cx" style="display: block; padding: 0 10px">                // as an ajax test may have defined DOING_AJAX, failing the test.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $cookie = wp_generate_auth_cookie( self::$user_id, time() - 7200, 'auth' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( false, wp_validate_auth_cookie( $cookie, 'auth' ), 'expired cookie' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( wp_validate_auth_cookie( $cookie, 'auth' ), 'expired cookie' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $cookie = wp_generate_auth_cookie( self::$user_id, time() + 3600, 'auth' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( false, wp_validate_auth_cookie( $cookie, 'logged_in' ), 'wrong auth scheme' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( wp_validate_auth_cookie( $cookie, 'logged_in' ), 'wrong auth scheme' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $cookie          = wp_generate_auth_cookie( self::$user_id, time() + 3600, 'auth' );

</span><span class="cx" style="display: block; padding: 0 10px">                list($a, $b, $c) = explode( '|', $cookie );

</span><span class="cx" style="display: block; padding: 0 10px">                $cookie          = $a . '|' . ( $b + 1 ) . '|' . $c;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( false, wp_validate_auth_cookie( self::$user_id, 'auth' ), 'altered cookie' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( wp_validate_auth_cookie( self::$user_id, 'auth' ), 'altered cookie' );

</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_auth_cookie_scheme() {

<span class="cx" style="display: block; padding: 0 10px">                // Arbitrary scheme name.

</span><span class="cx" style="display: block; padding: 0 10px">                $cookie = wp_generate_auth_cookie( self::$user_id, time() + 3600, 'foo' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( self::$user_id, wp_validate_auth_cookie( $cookie, 'foo' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( self::$user_id, wp_validate_auth_cookie( $cookie, 'foo' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Wrong scheme name - should fail.

</span><span class="cx" style="display: block; padding: 0 10px">                $cookie = wp_generate_auth_cookie( self::$user_id, time() + 3600, 'foo' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( false, wp_validate_auth_cookie( $cookie, 'bar' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( wp_validate_auth_cookie( $cookie, '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">@@ -82,7 +82,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $authed_user = wp_authenticate( $this->user->user_login, $password_to_test );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInstanceOf( 'WP_User', $authed_user );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $this->user->ID, $authed_user->ID );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $this->user->ID, $authed_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">@@ -136,7 +136,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_verify_nonce( $nonce, 'nonce_test_action' );

</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->assertEquals( ( $count + 1 ), did_action( $this->nonce_failure_hook ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( ( $count + 1 ), did_action( $this->nonce_failure_hook ) );

</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">@@ -148,7 +148,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_verify_nonce( $nonce, 'nonce_test_action' );

</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->assertEquals( $count, did_action( $this->nonce_failure_hook ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $count, did_action( $this->nonce_failure_hook ) );

</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">@@ -201,7 +201,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user = wp_authenticate( $this->user->user_login, $limit );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_User', $user );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( self::$user_id, $user->ID );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( self::$user_id, $user->ID );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // One char too many.

</span><span class="cx" style="display: block; padding: 0 10px">                $user = wp_authenticate( $this->user->user_login, $limit . 'a' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +211,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_password( $limit . 'a', self::$user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $user = get_user_by( 'id', self::$user_id );

<span class="cx" style="display: block; padding: 0 10px">                // Password broken by setting it to be too long.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '*', $user->data->user_pass );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '*', $user->data->user_pass );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user = wp_authenticate( $this->user->user_login, '*' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $user );

</span></span></pre></div>

<a id="trunktestsphpunittestsavatarphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/avatar.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/avatar.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/avatar.php        2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_avatar_url_gravatar_url() {

</span><span class="cx" style="display: block; padding: 0 10px">                $url = get_avatar_url( 1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( '|^http?://[0-9]+.gravatar.com/avatar/[0-9a-f]{32}\?|', $url ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( '|^http?://[0-9]+.gravatar.com/avatar/[0-9a-f]{32}\?|', $url ), 1 );

</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">@@ -19,11 +19,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_avatar_url_size() {

</span><span class="cx" style="display: block; padding: 0 10px">                $url = get_avatar_url( 1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( '|\?.*s=96|', $url ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( '|\?.*s=96|', $url ), 1 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $args = array( 'size' => 100 );

</span><span class="cx" style="display: block; padding: 0 10px">                $url  = get_avatar_url( 1, $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( '|\?.*s=100|', $url ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( '|\?.*s=100|', $url ), 1 );

</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">@@ -31,16 +31,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_avatar_url_default() {

</span><span class="cx" style="display: block; padding: 0 10px">                $url = get_avatar_url( 1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( '|\?.*d=mm|', $url ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( '|\?.*d=mm|', $url ), 1 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $args = array( 'default' => 'wavatar' );

</span><span class="cx" style="display: block; padding: 0 10px">                $url  = get_avatar_url( 1, $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( '|\?.*d=wavatar|', $url ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( '|\?.*d=wavatar|', $url ), 1 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( '|\?.*f=y|', $url ), 0 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( '|\?.*f=y|', $url ), 0 );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $args = array( 'force_default' => true );

</span><span class="cx" style="display: block; padding: 0 10px">                $url  = get_avatar_url( 1, $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( '|\?.*f=y|', $url ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( '|\?.*f=y|', $url ), 1 );

</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">@@ -48,11 +48,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_avatar_url_rating() {

</span><span class="cx" style="display: block; padding: 0 10px">                $url = get_avatar_url( 1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( '|\?.*r=g|', $url ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( '|\?.*r=g|', $url ), 1 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $args = array( 'rating' => 'M' );

</span><span class="cx" style="display: block; padding: 0 10px">                $url  = get_avatar_url( 1, $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( '|\?.*r=m|', $url ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( '|\?.*r=m|', $url ), 1 );

</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">@@ -60,15 +60,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_avatar_url_scheme() {

</span><span class="cx" style="display: block; padding: 0 10px">                $url = get_avatar_url( 1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( '|^http://|', $url ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( '|^http://|', $url ), 1 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $args = array( 'scheme' => 'https' );

</span><span class="cx" style="display: block; padding: 0 10px">                $url  = get_avatar_url( 1, $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( '|^https://|', $url ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( '|^https://|', $url ), 1 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $args = array( 'scheme' => 'lolcat' );

</span><span class="cx" style="display: block; padding: 0 10px">                $url  = get_avatar_url( 1, $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( '|^lolcat://|', $url ), 0 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( '|^lolcat://|', $url ), 0 );

</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">@@ -78,19 +78,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $url = get_avatar_url( 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $url2 = get_avatar_url( WP_TESTS_EMAIL );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $url, $url2 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $url, $url2 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $url2 = get_avatar_url( md5( WP_TESTS_EMAIL ) . '@md5.gravatar.com' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $url, $url2 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $url, $url2 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $user = get_user_by( 'id', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $url2 = get_avatar_url( $user );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $url, $url2 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $url, $url2 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create( array( 'post_author' => 1 ) );

</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">                $url2    = get_avatar_url( $post );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $url, $url2 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $url, $url2 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment_id = self::factory()->comment->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment    = get_comment( $comment_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $url2       = get_avatar_url( $comment );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $url, $url2 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $url, $url2 );

</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">        protected $fake_url;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $url = get_avatar_url( 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'pre_get_avatar_data', array( $this, 'pre_get_avatar_url_filter' ), 10 );

</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->assertEquals( $url, $this->fake_url );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $url, $this->fake_url );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px">        public function pre_get_avatar_url_filter( $args ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $args['url'] = $this->fake_url;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $url = get_avatar_url( 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'get_avatar_url', array( $this, 'get_avatar_url_filter' ), 10 );

</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->assertEquals( $url, $this->fake_url );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $url, $this->fake_url );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_avatar_url_filter( $url ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return $this->fake_url;

</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">                $url2 = get_avatar_url( $comment );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'get_avatar_comment_types', array( $this, 'get_avatar_comment_types_filter' ), 10 );

</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->assertEquals( $url, $url2 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $url, $url2 );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_avatar_comment_types_filter( $comment_types ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $comment_types[] = 'pingback';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,30 +169,30 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_avatar() {

</span><span class="cx" style="display: block; padding: 0 10px">                $img = get_avatar( 1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( "|^<img alt='[^']*' src='[^']*' srcset='[^']*' class='[^']*' height='[^']*' width='[^']*' loading='lazy'/>$|", $img ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( "|^<img alt='[^']*' src='[^']*' srcset='[^']*' class='[^']*' height='[^']*' width='[^']*' loading='lazy'/>$|", $img ), 1 );

</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_get_avatar_size() {

</span><span class="cx" style="display: block; padding: 0 10px">                $size = '100';

</span><span class="cx" style="display: block; padding: 0 10px">                $img  = get_avatar( 1, $size );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( "|^<img .*height='$size'.*width='$size'|", $img ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( "|^<img .*height='$size'.*width='$size'|", $img ), 1 );

</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_get_avatar_alt() {

</span><span class="cx" style="display: block; padding: 0 10px">                $alt = 'Mr Hyde';

</span><span class="cx" style="display: block; padding: 0 10px">                $img = get_avatar( 1, 96, '', $alt );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( "|^<img alt='$alt'|", $img ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( "|^<img alt='$alt'|", $img ), 1 );

</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_get_avatar_class() {

</span><span class="cx" style="display: block; padding: 0 10px">                $class = 'first';

</span><span class="cx" style="display: block; padding: 0 10px">                $img   = get_avatar( 1, 96, '', '', array( 'class' => $class ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( "|^<img .*class='[^']*{$class}[^']*'|", $img ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( "|^<img .*class='[^']*{$class}[^']*'|", $img ), 1 );

</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_get_avatar_default_class() {

</span><span class="cx" style="display: block; padding: 0 10px">                $img = get_avatar( 1, 96, '', '', array( 'force_default' => true ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( preg_match( "|^<img .*class='[^']*avatar-default[^']*'|", $img ), 1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( preg_match( "|^<img .*class='[^']*avatar-default[^']*'|", $img ), 1 );

</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_get_avatar_force_display() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +218,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $img = get_avatar( 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'pre_get_avatar', array( $this, 'pre_get_avatar_filter' ), 10 );

</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->assertEquals( $img, $this->fake_img );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $img, $this->fake_img );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px">        public function pre_get_avatar_filter( $img ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return $this->fake_img;

</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">                $img = get_avatar( 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'get_avatar', array( $this, 'get_avatar_filter' ), 10 );

</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->assertEquals( $img, $this->fake_url );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $img, $this->fake_url );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px">        public function get_avatar_filter( $img ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return $this->fake_url;

</span></span></pre></div>

<a id="trunktestsphpunittestsbasicphp"></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/basic.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/basic.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/basic.php 2020-09-02 00:35:36 UTC (rev 48937)

</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">                $license = file_get_contents( ABSPATH . 'license.txt' );

</span><span class="cx" style="display: block; padding: 0 10px">                preg_match( '#Copyright 2011-(\d+) by the contributors#', $license, $matches );

</span><span class="cx" style="display: block; padding: 0 10px">                $this_year = gmdate( 'Y' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this_year, trim( $matches[1] ), "license.txt's year needs to be updated to $this_year." );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this_year, trim( $matches[1] ), "license.txt's year needs to be updated to $this_year." );

</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_security_md() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                preg_match( '#\d.\d.x#', $security, $matches );

</span><span class="cx" style="display: block; padding: 0 10px">                $current_version = substr( $GLOBALS['wp_version'], 0, 3 );

</span><span class="cx" style="display: block; padding: 0 10px">                $latest_stable   = sprintf( '%s.x', (float) $current_version - 0.1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $latest_stable, trim( $matches[0] ), "SECURITY.md's version needs to be updated to $latest_stable." );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $latest_stable, trim( $matches[0] ), "SECURITY.md's version needs to be updated to $latest_stable." );

</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_package_json() {

</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">                if ( 1 === substr_count( $version, '.' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $version .= '.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->assertEquals( $version, $package_json['version'], "package.json's version needs to be updated to $version." );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $version, $package_json['version'], "package.json's version needs to be updated to $version." );

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $package_json;

</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">@@ -53,9 +53,9 @@

<span class="cx" style="display: block; padding: 0 10px">        // Test some helper utility functions.

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_strip_ws() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', strip_ws( '' ) );

-               $this->assertEquals( 'foo', strip_ws( 'foo' ) );

-               $this->assertEquals( '', strip_ws( "\r\n\t  \n\r\t" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', strip_ws( '' ) );

+               $this->assertSame( 'foo', strip_ws( 'foo' ) );

+               $this->assertSame( '', strip_ws( "\r\n\t  \n\r\t" ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $in  = "asdf\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $in .= "asdf asdf\n";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "foo bar\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= '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->assertEquals( $expected, strip_ws( $in ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, strip_ws( $in ) );

</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,6 +93,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <p>If a new user is created by WordPress, the password will be set, by default, to "changeme". Quite suggestive, eh? ;)</p>

</span><span class="cx" style="display: block; padding: 0 10px">         <ol id="authors"><form action="?import=wordpress&amp;step=2&amp;id=" method="post"><input type="hidden" name="_wpnonce" value="***" /><input type="hidden" name="_wp_http_referer" value="wp-test.php" /><li>Current author: <strong>Alex Shiels</strong><br />Create user  <input type="text" value="Alex Shiels" name="user[]" maxlength="30"> <br /> or map to existing<select name="userselect[0]">

</span><span class="cx" style="display: block; padding: 0 10px"> EOF;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, mask_input_value( $in ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, mask_input_value( $in ) );

</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="trunktestsphpunittestsblocksblockcontextphp"></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-context.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/block-context.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/blocks/block-context.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                render_block( $parsed_blocks[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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'gutenberg/contextWithDefault'  => 0,

</span><span class="cx" style="display: block; padding: 0 10px">                                'gutenberg/contextWithAssigned' => 10,

</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">                render_block( $parsed_blocks[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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'postId'   => $post->ID,

</span><span class="cx" style="display: block; padding: 0 10px">                                'postType' => $post->post_type,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'render_block_context', $filter_block_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->assertEquals( array( 'example' => 'ok' ), $provided_context[0] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'example' => 'ok' ), $provided_context[0] );

</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="trunktestsphpunittestsblocksblocklistphp"></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-list.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/block-list.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/blocks/block-list.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,12 +54,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( isset( $blocks[0] ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test "offsetGet".

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'core/example', $blocks[0]->name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'core/example', $blocks[0]->name );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test "offsetSet".

</span><span class="cx" style="display: block; padding: 0 10px">                $parsed_blocks[0]['blockName'] = 'core/updated';

</span><span class="cx" style="display: block; padding: 0 10px">                $blocks[0]                     = new WP_Block( $parsed_blocks[0], $context, $this->registry );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'core/updated', $blocks[0]->name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'core/updated', $blocks[0]->name );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test "offsetUnset".

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $blocks[0] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,10 +76,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $assertions    = 0;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $blocks as $block ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 'core/example', $block->name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'core/example', $block->name );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $assertions++;

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $block->inner_blocks as $inner_block ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $this->assertEquals( 'core/example', $inner_block->name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $this->assertSame( 'core/example', $inner_block->name );

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $assertions++;

</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">@@ -88,14 +88,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                while ( $blocks->valid() ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $key   = $blocks->key();

</span><span class="cx" style="display: block; padding: 0 10px">                        $block = $blocks->current();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 0, $key );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 0, $key );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $assertions++;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 'core/example', $block->name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'core/example', $block->name );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $assertions++;

</span><span class="cx" style="display: block; padding: 0 10px">                        $blocks->next();

</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->assertEquals( 4, $assertions );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 4, $assertions );

</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">@@ -106,7 +106,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $context       = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $blocks        = new WP_Block_List( $parsed_blocks, $context, $this->registry );

</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->assertEquals( 1, count( $blocks ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $blocks ) );

</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="trunktestsphpunittestsblocksblockparserphp"></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-parser.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/block-parser.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/blocks/block-parser.php   2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $parser = new WP_Block_Parser();

</span><span class="cx" style="display: block; padding: 0 10px">                $result = json_decode( json_encode( $parser->parse( $html ) ), 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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $expected_parsed,

</span><span class="cx" style="display: block; padding: 0 10px">                        $result,

</span><span class="cx" style="display: block; padding: 0 10px">                        "File '$parsed_json_filename' does not match expected value"

</span></span></pre></div>

<a id="trunktestsphpunittestsblocksblocktyperegistryphp"></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-type-registry.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/block-type-registry.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/blocks/block-type-registry.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,9 +106,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">                $block_type = $this->registry->register( $name, $settings );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $name, $block_type->name );

-               $this->assertEquals( $settings['icon'], $block_type->icon );

-               $this->assertEquals( $block_type, $this->registry->get_registered( $name ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $name, $block_type->name );

+               $this->assertSame( $settings['icon'], $block_type->icon );

+               $this->assertSame( $block_type, $this->registry->get_registered( $name ) );

</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">@@ -167,8 +167,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->registry->register( $name, $settings );

</span><span class="cx" style="display: block; padding: 0 10px">                $block_type = $this->registry->unregister( $name );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $name, $block_type->name );

-               $this->assertEquals( $settings['icon'], $block_type->icon );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $name, $block_type->name );

+               $this->assertSame( $settings['icon'], $block_type->icon );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $this->registry->is_registered( $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="trunktestsphpunittestsblocksblocktypephp"></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-type.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/block-type.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/blocks/block-type.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,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">                $output     = $block_type->render( $attributes );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $attributes, json_decode( $output, true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $attributes, json_decode( $output, true ) );

</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">@@ -123,7 +123,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">                $output     = $block_type->render( $attributes, $content );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, json_decode( $output, true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, json_decode( $output, true ) );

</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">@@ -133,7 +133,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $block_type = new WP_Block_Type( 'core/fake', array() );

</span><span class="cx" style="display: block; padding: 0 10px">                $output     = $block_type->render();

</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->assertEquals( '', $output );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', $output );

</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">@@ -223,7 +223,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $prepared_attributes = $block_type->prepare_attributes_for_render( $attributes );

</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->assertEquals( $attributes, $prepared_attributes );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $attributes, $prepared_attributes );

</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="trunktestsphpunittestsblocksblockphp"></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.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/block.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/blocks/block.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,10 +57,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $block         = new WP_Block( $parsed_block, $context, $this->registry );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $parsed_block, $block->parsed_block );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $parsed_block['blockName'], $block->name );

-               $this->assertEquals( $parsed_block['attrs'], $block->attributes );

-               $this->assertEquals( $parsed_block['innerContent'], $block->inner_content );

-               $this->assertEquals( $parsed_block['innerHTML'], $block->inner_html );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $parsed_block['blockName'], $block->name );

+               $this->assertSame( $parsed_block['attrs'], $block->attributes );

+               $this->assertSame( $parsed_block['innerContent'], $block->inner_content );

+               $this->assertSame( $parsed_block['innerHTML'], $block->inner_html );

</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">@@ -82,7 +82,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $block        = new WP_Block( $parsed_block, $context, $this->registry );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( WP_Block_Type::class, $block->block_type );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $block_type_settings['attributes'],

</span><span class="cx" style="display: block; padding: 0 10px">                        $block->block_type->attributes

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,10 +113,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $context      = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $block        = new WP_Block( $parsed_block, $context, $this->registry );

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'explicit'  => 20,

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'defaulted' => 10,

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'explicit'  => 20,

</del><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $block->attributes

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,9 +145,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $context      = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $block        = new WP_Block( $parsed_block, $context, $this->registry );

</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->assertEquals( array( 'defaulted' => 10 ), $block->attributes );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'defaulted' => 10 ), $block->attributes );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Intentionally call a second time, to ensure property was assigned.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( 'defaulted' => 10 ), $block->attributes );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'defaulted' => 10 ), $block->attributes );

</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">@@ -168,7 +168,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $block        = new WP_Block( $parsed_block, $context, $this->registry );

</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->assertEquals( array( 'requested' => 'included' ), $block->context );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'requested' => 'included' ), $block->context );

</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">@@ -184,7 +184,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 1, $block->inner_blocks );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( WP_Block::class, $block->inner_blocks[0] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'core/example', $block->inner_blocks[0]->name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'core/example', $block->inner_blocks[0]->name );

</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">@@ -217,7 +217,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $block         = new WP_Block( $parsed_block, $context, $this->registry );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 0, $block->context );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'core/recordId' => 10 ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $block->inner_blocks[0]->context

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,15 +253,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $context       = array( 'core/value' => 'original' );

</span><span class="cx" style="display: block; padding: 0 10px">                $block         = new WP_Block( $parsed_block, $context, $this->registry );

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'core/value' => 'original' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $block->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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'core/value' => 'merged' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $block->inner_blocks[0]->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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'core/value' => null ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $block->inner_blocks[0]->inner_blocks[0]->context

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span></span></pre></div>

<a id="trunktestsphpunittestsblocksregisterphp"></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/register.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/register.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/blocks/register.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,7 +292,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'star', $result->icon );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 'Shows warning, error or success notices…', $result->description );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( 'alert', 'message' ), $result->keywords );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'message' => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'type'     => 'string',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +302,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $result->attributes

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'my-plugin/message' => 'message',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,7 +309,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $result->provides_context

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( 'groupId' ), $result->uses_context );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'align'             => true,

</span><span class="cx" style="display: block; padding: 0 10px">                                'lightBlockWrapper' => true,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,7 +316,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $result->supports

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'name'      => 'default',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,7 +330,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $result->styles

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'attributes' => array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        'message' => 'This is a notice!',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,6 +396,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $registry   = WP_Block_Type_Registry::get_instance();

</span><span class="cx" style="display: block; padding: 0 10px">                $block_type = $registry->get_registered( 'core/test-filtered' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'boolean', $block_type->attributes['core/test-filtered']['type'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'boolean', $block_type->attributes['core/test-filtered']['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>

<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       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/blocks/render.php 2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $actual_html = do_blocks( $original_html );

</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->assertEqualsIgnoreEOL( $expected_html, $actual_html );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected_html, $actual_html );

</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">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_shortcode( 'someshortcode' );

</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->assertEquals( trim( $classic_filtered_content ), trim( $block_filtered_content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( trim( $classic_filtered_content ), trim( $block_filtered_content ) );

</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 handle_shortcode( $atts, $content ) {

</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">                        $content = '<!-- wp:core/test -->' . $content . '<!-- /wp:core/test -->';

</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->assertEquals( 'deep inside', do_blocks( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'deep inside', do_blocks( $content ) );

</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_can_nest_at_least_so_deep_with_dynamic_blocks() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,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->assertEquals( $minimum_depth, (int) do_blocks( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $minimum_depth, (int) do_blocks( $content ) );

</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 render_dynamic_incrementer( $attrs, $content ) {

</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">                $filtered_content = trim( apply_filters( 'the_content', $test_content ) );

</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->assertEquals( $expected_content, $filtered_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_content, $filtered_content );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check that wpautop() is still defined in the same place.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $current_priority, has_action( 'the_content', 'wpautop' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $filtered_content = trim( apply_filters( 'the_content', $test_content ) );

</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->assertEquals( $expected_content, $filtered_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_content, $filtered_content );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $current_priority, has_action( 'the_content', 'wpautop' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_action( 'the_content', '_restore_wpautop_hook' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +222,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $html          = do_blocks( self::strip_r( file_get_contents( $html_path ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected_html = self::strip_r( file_get_contents( $server_html_path ) );

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $expected_html,

</span><span class="cx" style="display: block; padding: 0 10px">                        $html,

</span><span class="cx" style="display: block; padding: 0 10px">                        "File '$html_path' does not match expected value"

</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">                        'after';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $updated_post_content = do_blocks( $post_content );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $updated_post_content,

</span><span class="cx" style="display: block; padding: 0 10px">                        'before' .

</span><span class="cx" style="display: block; padding: 0 10px">                        '1:b1' .

</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">                $global_post = $post;

</span><span class="cx" style="display: block; padding: 0 10px">                do_blocks( '<!-- wp:core/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->assertEquals( $global_post, $post );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $global_post, $post );

</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_render_latest_comments_on_password_protected_post() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,7 +342,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $data = unserialize( base64_decode( $output ) );

</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->assertEquals( 'inner', $data[1] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'inner', $data[1] );

</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_rendered_inner_blocks() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,7 +370,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $data = unserialize( base64_decode( $output ) );

</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->assertEquals( 'before10after', $data[1] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'before10after', $data[1] );

</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_rendered_inner_dynamic_blocks() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,7 +390,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $inner = $this->render_serialize_dynamic_block( array(), 'deep inner' );

</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->assertEquals( $data[1], 'before' . $inner . 'after' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $data[1], 'before' . $inner . 'after' );

</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="trunktestsphpunittestsblocksserializationphp"></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/serialization.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/serialization.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/blocks/serialization.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = serialize_blocks( $blocks );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = $original;

</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->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function data_serialize_identity_from_parsed() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,10 +51,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_serialized_block_name() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( null, strip_core_block_namespace( null ) );

-               $this->assertEquals( 'example', strip_core_block_namespace( 'example' ) );

-               $this->assertEquals( 'example', strip_core_block_namespace( 'core/example' ) );

-               $this->assertEquals( 'plugin/example', strip_core_block_namespace( 'plugin/example' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertNull( strip_core_block_namespace( null ) );

+               $this->assertSame( 'example', strip_core_block_namespace( 'example' ) );

+               $this->assertSame( 'example', strip_core_block_namespace( 'core/example' ) );

+               $this->assertSame( 'plugin/example', strip_core_block_namespace( 'plugin/example' ) );

</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="trunktestsphpunittestscachephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/cache.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/cache.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/cache.php 2020-09-02 00:35:36 UTC (rev 48937)

</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">                $val = 'val';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->add( $key, $val );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, $this->cache->get( $key ) );

</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_add_get_0() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // You can store zero in the cache.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->add( $key, $val );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, $this->cache->get( $key ) );

</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_add_get_null() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,10 +63,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Add $key to the cache.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->cache->add( $key, $val1 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val1, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val1, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // $key is in the cache, so reject new calls to add().

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->cache->add( $key, $val2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val1, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val1, $this->cache->get( $key ) );

</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_replace() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,9 +78,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->cache->replace( $key, $val ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->cache->get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->cache->add( $key, $val ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $this->cache->replace( $key, $val2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val2, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val2, $this->cache->get( $key ) );

</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_set() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,10 +90,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // memcached accepts set() if the key does not exist.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->cache->set( $key, $val1 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val1, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val1, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Second set() with same key should be allowed.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->cache->set( $key, $val2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val2, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val2, $this->cache->get( $key ) );

</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_flush() {

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->add( $key, $val );

<span class="cx" style="display: block; padding: 0 10px">                // Item is visible to both cache objects.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->cache->flush();

<span class="cx" style="display: block; padding: 0 10px">                // If there is no value get returns false.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->cache->get( $key ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,9 +122,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->set( $key, $object_a );

</span><span class="cx" style="display: block; padding: 0 10px">                $object_a->foo = 'bravo';

</span><span class="cx" style="display: block; padding: 0 10px">                $object_b      = $this->cache->get( $key );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'alpha', $object_b->foo );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'alpha', $object_b->foo );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $object_b->foo = 'charlie';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'bravo', $object_a->foo );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'bravo', $object_a->foo );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $key           = __FUNCTION__ . '_2';

</span><span class="cx" style="display: block; padding: 0 10px">                $object_a      = new stdClass;

</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">                $this->cache->add( $key, $object_a );

</span><span class="cx" style="display: block; padding: 0 10px">                $object_a->foo = 'bravo';

</span><span class="cx" style="display: block; padding: 0 10px">                $object_b      = $this->cache->get( $key );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'alpha', $object_b->foo );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'alpha', $object_b->foo );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $object_b->foo = 'charlie';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'bravo', $object_a->foo );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'bravo', $object_a->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">        function test_incr() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,10 +144,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->set( $key, 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->incr( $key );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->incr( $key, 2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 3, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 3, $this->cache->get( $key ) );

</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_wp_cache_incr() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,10 +157,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_set( $key, 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_incr( $key );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, wp_cache_get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, wp_cache_get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_incr( $key, 2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 3, wp_cache_get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 3, wp_cache_get( $key ) );

</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_decr() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,14 +170,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->set( $key, 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->decr( $key );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 0, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->set( $key, 3 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->decr( $key );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 2, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->cache->decr( $key, 2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 0, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $this->cache->get( $key ) );

</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">@@ -190,14 +190,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_set( $key, 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_decr( $key );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 0, wp_cache_get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, wp_cache_get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_set( $key, 3 );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_decr( $key );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 2, wp_cache_get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, wp_cache_get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_decr( $key, 2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 0, wp_cache_get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, wp_cache_get( $key ) );

</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_delete() {

</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 class="cx" style="display: block; padding: 0 10px">                // Verify set.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->cache->set( $key, $val ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify successful delete.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->cache->delete( $key ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +221,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify set.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( wp_cache_set( $key, $val ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, wp_cache_get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, wp_cache_get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify successful delete.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( wp_cache_delete( $key ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,38 +246,38 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_multisite() ) {

<span class="cx" style="display: block; padding: 0 10px">                        // Single site ingnores switch_to_blog().

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( $this->cache->set( $key, $val ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $val, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $val, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->cache->switch_to_blog( 999 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $val, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $val, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( $this->cache->set( $key, $val2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $val2, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $val2, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->cache->switch_to_blog( get_current_blog_id() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $val2, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $val2, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {

<span class="cx" style="display: block; padding: 0 10px">                        // Multisite should have separate per-blog caches.

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( $this->cache->set( $key, $val ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $val, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $val, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->cache->switch_to_blog( 999 );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( $this->cache->get( $key ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( $this->cache->set( $key, $val2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $val2, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $val2, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->cache->switch_to_blog( get_current_blog_id() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $val, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $val, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->cache->switch_to_blog( 999 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $val2, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $val2, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->cache->switch_to_blog( get_current_blog_id() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $val, $this->cache->get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $val, $this->cache->get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Global group.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->cache->set( $key, $val, 'global-cache-test' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, $this->cache->get( $key, 'global-cache-test' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, $this->cache->get( $key, 'global-cache-test' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->cache->switch_to_blog( 999 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, $this->cache->get( $key, 'global-cache-test' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, $this->cache->get( $key, 'global-cache-test' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $this->cache->set( $key, $val2, 'global-cache-test' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val2, $this->cache->get( $key, 'global-cache-test' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val2, $this->cache->get( $key, 'global-cache-test' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->cache->switch_to_blog( get_current_blog_id() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val2, $this->cache->get( $key, 'global-cache-test' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val2, $this->cache->get( $key, 'global-cache-test' ) );

</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_wp_cache_init() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,11 +303,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Save the first value to cache and verify.

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_set( $key, $val1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val1, wp_cache_get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val1, wp_cache_get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Replace the value and verify.

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_replace( $key, $val2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val2, wp_cache_get( $key ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val2, wp_cache_get( $key ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Non-existant key should fail.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_cache_replace( $fake_key, $val1 ) );

</span></span></pre></div>

<a id="trunktestsphpunittestscanonicalhttpsphp"></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/canonical/https.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/https.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/canonical/https.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,11 +24,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 27954

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_http_request_with_http_home() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

</del><span class="cx" style="display: block; padding: 0 10px">                 $redirect = redirect_canonical( $this->http, 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->assertEquals( $redirect, false );

-

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertNull( $redirect );

</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">@@ -35,11 +33,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 27954

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_https_request_with_http_home() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

</del><span class="cx" style="display: block; padding: 0 10px">                 $redirect = redirect_canonical( $this->https, 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->assertEquals( $redirect, false );

-

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertNull( $redirect );

</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">@@ -46,15 +42,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 27954

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_https_request_with_https_home() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

</del><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'home_url', array( $this, 'set_https' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $redirect = redirect_canonical( $this->https, 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->assertEquals( $redirect, false );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertNull( $redirect );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'home_url', array( $this, 'set_https' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

</del><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunktestsphpunittestscanonicalphp"></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/canonical.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/canonical.php     2020-09-02 00:35:36 UTC (rev 48937)

</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">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( '/child-page-1' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'wp', redirect_guess_404_permalink() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'wp', redirect_guess_404_permalink() );

</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">@@ -268,7 +268,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( 'strict-redirect' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test default 'non-strict' redirect guess.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_permalink( $post ), redirect_guess_404_permalink() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_permalink( $post ), redirect_guess_404_permalink() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test 'strict' redirect guess.

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'strict_redirect_guess_404_permalink', '__return_true' );

</span></span></pre></div>

<a id="trunktestsphpunittestscategoryphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/category.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/category.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/category.php      2020-09-02 00:35:36 UTC (rev 48937)

</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"> 

<span class="cx" style="display: block; padding: 0 10px">                // Validate length is 1 + created due to uncategorized.

</span><span class="cx" style="display: block; padding: 0 10px">                $cat_ids = get_all_category_ids();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 3, count( $cat_ids ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 3, count( $cat_ids ) );

</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">@@ -53,9 +53,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Validate category is returned by slug.

</span><span class="cx" style="display: block; padding: 0 10px">                $ret_testcat = get_category_by_slug( 'testcat' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $testcat->term_id, $ret_testcat->term_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $testcat->term_id, $ret_testcat->term_id );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $ret_testcat = get_category_by_slug( 'TeStCaT' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $testcat->term_id, $ret_testcat->term_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $testcat->term_id, $ret_testcat->term_id );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Validate unknown category returns false.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( get_category_by_slug( 'testcat3' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,36 +107,36 @@

</span><span class="cx" style="display: block; padding: 0 10px">                _make_cat_compat( $testcat2_array );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Validate compatibility object.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $testcat->cat_ID, $testcat->term_id );

-               $this->assertEquals( $testcat->category_count, $testcat->count );

-               $this->assertEquals( $testcat->category_description, $testcat->description );

-               $this->assertEquals( $testcat->cat_name, $testcat->name );

-               $this->assertEquals( $testcat->category_nicename, $testcat->slug );

-               $this->assertEquals( $testcat->category_parent, $testcat->parent );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $testcat->cat_ID, $testcat->term_id );

+               $this->assertSame( $testcat->category_count, $testcat->count );

+               $this->assertSame( $testcat->category_description, $testcat->description );

+               $this->assertSame( $testcat->cat_name, $testcat->name );

+               $this->assertSame( $testcat->category_nicename, $testcat->slug );

+               $this->assertSame( $testcat->category_parent, $testcat->parent );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Validate compatibility object with parent.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $testcat->cat_ID, $testcat->term_id );

-               $this->assertEquals( $testcat->category_count, $testcat->count );

-               $this->assertEquals( $testcat->category_description, $testcat->description );

-               $this->assertEquals( $testcat->cat_name, $testcat->name );

-               $this->assertEquals( $testcat->category_nicename, $testcat->slug );

-               $this->assertEquals( $testcat->category_parent, $testcat->parent );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $testcat->cat_ID, $testcat->term_id );

+               $this->assertSame( $testcat->category_count, $testcat->count );

+               $this->assertSame( $testcat->category_description, $testcat->description );

+               $this->assertSame( $testcat->cat_name, $testcat->name );

+               $this->assertSame( $testcat->category_nicename, $testcat->slug );

+               $this->assertSame( $testcat->category_parent, $testcat->parent );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Validate compatibility array.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $testcat_array['cat_ID'], $testcat_array['term_id'] );

-               $this->assertEquals( $testcat_array['category_count'], $testcat_array['count'] );

-               $this->assertEquals( $testcat_array['category_description'], $testcat_array['description'] );

-               $this->assertEquals( $testcat_array['cat_name'], $testcat_array['name'] );

-               $this->assertEquals( $testcat_array['category_nicename'], $testcat_array['slug'] );

-               $this->assertEquals( $testcat_array['category_parent'], $testcat_array['parent'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $testcat_array['cat_ID'], $testcat_array['term_id'] );

+               $this->assertSame( $testcat_array['category_count'], $testcat_array['count'] );

+               $this->assertSame( $testcat_array['category_description'], $testcat_array['description'] );

+               $this->assertSame( $testcat_array['cat_name'], $testcat_array['name'] );

+               $this->assertSame( $testcat_array['category_nicename'], $testcat_array['slug'] );

+               $this->assertSame( $testcat_array['category_parent'], $testcat_array['parent'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Validate compatibility array with parent.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $testcat_array['cat_ID'], $testcat_array['term_id'] );

-               $this->assertEquals( $testcat_array['category_count'], $testcat_array['count'] );

-               $this->assertEquals( $testcat_array['category_description'], $testcat_array['description'] );

-               $this->assertEquals( $testcat_array['cat_name'], $testcat_array['name'] );

-               $this->assertEquals( $testcat_array['category_nicename'], $testcat_array['slug'] );

-               $this->assertEquals( $testcat_array['category_parent'], $testcat_array['parent'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $testcat_array['cat_ID'], $testcat_array['term_id'] );

+               $this->assertSame( $testcat_array['category_count'], $testcat_array['count'] );

+               $this->assertSame( $testcat_array['category_description'], $testcat_array['description'] );

+               $this->assertSame( $testcat_array['cat_name'], $testcat_array['name'] );

+               $this->assertSame( $testcat_array['category_nicename'], $testcat_array['slug'] );

+               $this->assertSame( $testcat_array['category_parent'], $testcat_array['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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,9 +153,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">                // Validate.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $testcat->name, get_cat_name( $testcat->term_id ) );

-               $this->assertEquals( '', get_cat_name( -1 ) );

-               $this->assertEquals( '', get_cat_name( $testcat->term_id + 100 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $testcat->name, get_cat_name( $testcat->term_id ) );

+               $this->assertSame( '', get_cat_name( -1 ) );

+               $this->assertSame( '', get_cat_name( $testcat->term_id + 100 ) );

</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">@@ -173,9 +173,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">                // Validate.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $testcat->term_id, get_cat_ID( $testcat->name ) );

-               $this->assertEquals( 0, get_cat_ID( 'NO CAT' ) );

-               $this->assertEquals( 0, get_cat_ID( 12 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $testcat->term_id, get_cat_ID( $testcat->name ) );

+               $this->assertSame( 0, get_cat_ID( 'NO CAT' ) );

+               $this->assertSame( 0, get_cat_ID( 12 ) );

</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">@@ -229,17 +229,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Validate full match.

</span><span class="cx" style="display: block; padding: 0 10px">                $ret_cat = get_category_by_path( '/root/level-1', true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $root_level_id, $ret_cat->term_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $root_level_id, $ret_cat->term_id );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNull( get_category_by_path( 'level-1', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( get_category_by_path( 'nocat/nocat/', true ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Validate partial match.

</span><span class="cx" style="display: block; padding: 0 10px">                $ret_cat = get_category_by_path( 'level-1', false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $root_level_id, $ret_cat->term_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $root_level_id, $ret_cat->term_id );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $ret_cat = get_category_by_path( 'root/cat/level-1', false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $root_level_id, $ret_cat->term_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $root_level_id, $ret_cat->term_id );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $ret_cat = get_category_by_path( 'root$2Fcat%20%2Flevel-1', false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $root_level_id, $ret_cat->term_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $root_level_id, $ret_cat->term_id );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNull( get_category_by_path( 'nocat/nocat/', false ) );

</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="trunktestsphpunittestscommentdateQueryphp"></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/dateQuery.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/dateQuery.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/comment/dateQuery.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,6 +77,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        '2008-12-10 13:06:27',

</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->assertEquals( $expected_dates, wp_list_pluck( $comments, 'comment_date' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_dates, wp_list_pluck( $comments, 'comment_date' ) );

</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="trunktestsphpunittestscommentgetCommentAuthorEmailLinkphp"></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/getCommentAuthorEmailLink.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentAuthorEmailLink.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/comment/getCommentAuthorEmailLink.php     2020-09-02 00:35:36 UTC (rev 48937)

</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">        public function test_global_comment_with_default_parameters() {

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<a href="mailto:foo@example.org">foo@example.org</a>';

</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->assertEquals( $expected, get_comment_author_email_link() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_comment_author_email_link() );

</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">@@ -53,7 +53,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = sprintf( '%1$s<a href="mailto:%2$s">%3$s</a>%4$s', $before, $email, $linktext, $after );

</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->assertEquals( $expected, get_comment_author_email_link( $linktext, $before, $after, $comment ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_comment_author_email_link( $linktext, $before, $after, $comment ) );

</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_all_parameters_with_global_comment() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,25 +63,25 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = sprintf( '%1$s<a href="mailto:foo@example.org">%2$s</a>%3$s', $before, $linktext, $after );

</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->assertEquals( $expected, get_comment_author_email_link( $linktext, $before, $after ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_comment_author_email_link( $linktext, $before, $after ) );

</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_linktext() {

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = sprintf( '<a href="mailto:foo@example.org">%1$s</a>', $linktext = 'linktext' );

</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->assertEquals( $expected, get_comment_author_email_link( $linktext ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_comment_author_email_link( $linktext ) );

</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_before() {

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = sprintf( '%1$s<a href="mailto:foo@example.org">foo@example.org</a>', $before = 'before' );

</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->assertEquals( $expected, get_comment_author_email_link( '', $before ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_comment_author_email_link( '', $before ) );

</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_after() {

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = sprintf( '<a href="mailto:foo@example.org">foo@example.org</a>%1$s', $after = 'after' );

</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->assertEquals( $expected, get_comment_author_email_link( '', '', $after ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_comment_author_email_link( '', '', $after ) );

</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">@@ -96,6 +96,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = sprintf( '<a href="mailto:%1$s">%2$s</a>', $email, $email );

</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->assertEquals( $expected, get_comment_author_email_link( '', '', '', $comment ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_comment_author_email_link( '', '', '', $comment ) );

</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="trunktestsphpunittestscommentgetCommentAuthorUrlLinkphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php       2020-09-02 00:35:36 UTC (rev 48937)

</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">        public function test_no_comment() {

</span><span class="cx" style="display: block; padding: 0 10px">                $url_link = get_comment_author_url_link();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "<a href='' rel='external'></a>", $url_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "<a href='' rel='external'></a>", $url_link );

</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_global_comment() {

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $url_link = get_comment_author_url_link();

</span><span class="cx" style="display: block; padding: 0 10px">                $link     = $this->parseCommentAuthorUrl( $comment );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $link, $url_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $link, $url_link );

</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_comment_arg() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $url_link = get_comment_author_url_link( '', '', '', $comment );

</span><span class="cx" style="display: block; padding: 0 10px">                $link     = $this->parseCommentAuthorUrl( $comment );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $link, $url_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $link, $url_link );

</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_linktext() {

</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">                $url_link = get_comment_author_url_link( 'Burrito', '', '', $comment );

</span><span class="cx" style="display: block; padding: 0 10px">                $link     = $this->parseCommentAuthorUrl( $comment, 'Burrito' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $link, $url_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $link, $url_link );

</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_before() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $url_link = get_comment_author_url_link( 'Burrito', 'I would love a ', '', $comment );

</span><span class="cx" style="display: block; padding: 0 10px">                $link     = 'I would love a ' . $this->parseCommentAuthorUrl( $comment, 'Burrito' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $link, $url_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $link, $url_link );

</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_after() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $url_link = get_comment_author_url_link( 'Burrito', '', ' is my favorite word.', $comment );

</span><span class="cx" style="display: block; padding: 0 10px">                $link     = $this->parseCommentAuthorUrl( $comment, 'Burrito' ) . ' is my favorite word.';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $link, $url_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $link, $url_link );

</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_before_after() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,6 +76,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $url_link = get_comment_author_url_link( 'Burrito', 'I would love a ', ' right now.', $comment );

</span><span class="cx" style="display: block; padding: 0 10px">                $link     = 'I would love a ' . $this->parseCommentAuthorUrl( $comment, 'Burrito' ) . ' right now.';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $link, $url_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $link, $url_link );

</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="trunktestsphpunittestscommentgetCommentExcerptphp"></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/getCommentExcerpt.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentExcerpt.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/comment/getCommentExcerpt.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $excerpt = get_comment_excerpt( $comment_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->assertEquals( 20, count( explode( ' ', $excerpt ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 20, count( explode( ' ', $excerpt ) ) );

</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_get_comment_excerpt_filtered() {

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $excerpt = get_comment_excerpt( $comment_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->assertEquals( 10, count( explode( ' ', $excerpt ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, count( explode( ' ', $excerpt ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function _filter_comment_excerpt_length() {

</span></span></pre></div>

<a id="trunktestsphpunittestscommentgetCommentsPagesCountphp"></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/getCommentsPagesCount.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php 2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,12 +52,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comments = get_comments( array( 'post_id' => $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->assertEquals( 0, get_comment_pages_count( $comments, 10, false ) );

-               $this->assertEquals( 0, get_comment_pages_count( $comments, 1, false ) );

-               $this->assertEquals( 0, get_comment_pages_count( $comments, 0, false ) );

-               $this->assertEquals( 0, get_comment_pages_count( $comments, 10, true ) );

-               $this->assertEquals( 0, get_comment_pages_count( $comments, 5 ) );

-               $this->assertEquals( 0, get_comment_pages_count( $comments ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, get_comment_pages_count( $comments, 10, false ) );

+               $this->assertSame( 0, get_comment_pages_count( $comments, 1, false ) );

+               $this->assertSame( 0, get_comment_pages_count( $comments, 0, false ) );

+               $this->assertSame( 0, get_comment_pages_count( $comments, 10, true ) );

+               $this->assertSame( 0, get_comment_pages_count( $comments, 5 ) );

+               $this->assertSame( 0, get_comment_pages_count( $comments ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertequals( 0, get_comment_pages_count( null, 1 ) );

</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="trunktestsphpunittestscommentgetPageOfCommentphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment/getPageOfComment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getPageOfComment.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/comment/getPageOfComment.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,11 +28,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-15 00:00:00' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment_first = self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-14 00:00:00' ) );

</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->assertEquals( 4, get_page_of_comment( $comment_last[0], array( 'per_page' => 3 ) ) );

-               $this->assertEquals( 2, get_page_of_comment( $comment_last[0], array( 'per_page' => 10 ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 4, get_page_of_comment( $comment_last[0], array( 'per_page' => 3 ) ) );

+               $this->assertSame( 2, get_page_of_comment( $comment_last[0], array( 'per_page' => 10 ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, get_page_of_comment( $comment_first[0], array( 'per_page' => 3 ) ) );

-               $this->assertEquals( 1, get_page_of_comment( $comment_first[0], array( 'per_page' => 10 ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, get_page_of_comment( $comment_first[0], array( 'per_page' => 3 ) ) );

+               $this->assertSame( 1, get_page_of_comment( $comment_first[0], array( 'per_page' => 10 ) ) );

</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_type_pings() {

</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">                        $now            -= 10 * $i;

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         2,

</span><span class="cx" style="display: block; padding: 0 10px">                        get_page_of_comment(

</span><span class="cx" style="display: block; padding: 0 10px">                                $trackbacks[0],

</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">                                )

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         3,

</span><span class="cx" style="display: block; padding: 0 10px">                        get_page_of_comment(

</span><span class="cx" style="display: block; padding: 0 10px">                                $pingbacks[0],

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         5,

</span><span class="cx" style="display: block; padding: 0 10px">                        get_page_of_comment(

</span><span class="cx" style="display: block; padding: 0 10px">                                $trackbacks[0],

</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">                                'type'     => 'trackback',

</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->assertEquals( 2, $page_trackbacks );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, $page_trackbacks );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $num_queries   = $wpdb->num_queries;

</span><span class="cx" style="display: block; padding: 0 10px">                $page_comments = get_page_of_comment(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'type'     => 'comment',

</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->assertEquals( 1, $page_comments );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $page_comments );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $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">@@ -243,11 +243,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, get_page_of_comment( $c1, array( 'per_page' => 2 ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, get_page_of_comment( $c1, array( 'per_page' => 2 ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_comment_status( $c3, '1' );

</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->assertEquals( 2, get_page_of_comment( $c1, array( 'per_page' => 2 ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, get_page_of_comment( $c1, array( 'per_page' => 2 ) ) );

</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">@@ -275,10 +275,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $found_0 = get_page_of_comment( $comments_0[0], array( 'per_page' => 2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 3, $found_0 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 3, $found_0 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $found_1 = get_page_of_comment( $comments_1[1], array( 'per_page' => 2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 2, $found_1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, $found_1 );

</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">@@ -357,7 +357,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'page_comments', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'comments_per_page', 2 );

</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->assertEquals( 2, get_page_of_comment( $c1 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, get_page_of_comment( $c1 ) );

</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">@@ -397,7 +397,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'page_comments', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'comments_per_page', 1 );

</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->assertEquals( 2, get_page_of_comment( $c3 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, get_page_of_comment( $c3 ) );

</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">@@ -437,7 +437,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'page_comments', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'comments_per_page', 1 );

</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->assertEquals( 2, get_page_of_comment( $c3 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, get_page_of_comment( $c3 ) );

</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="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       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/comment/query.php 2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -722,7 +722,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->assertEquals( array( $c2 ), $found );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $c2 ), $found );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -758,7 +758,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->assertEquals( array( $c2 ), $found );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $c2 ), $found );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -874,7 +874,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->assertEquals( array( $c2 ), $found );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $c2 ), $found );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -910,7 +910,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->assertEquals( array( $c2 ), $found );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $c2 ), $found );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1016,7 +1016,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->assertEquals( array( $c2 ), $found );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $c2 ), $found );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1044,7 +1044,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->assertEquals( array( $c1 ), $found );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $c1 ), $found );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_status_custom() {

</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">                );

</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->assertEquals( array( $c2 ), $found );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $c2 ), $found );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_status_all() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1293,8 +1293,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</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">                self::factory()->comment->create_post_comments( $post_id, $limit );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comments = get_comments( array( 'post_id' => $post_id ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $limit, count( $comments ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $limit, count( $comments ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $comments as $comment ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post_id, $comment->comment_post_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1301,8 +1302,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id2 = self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->comment->create_post_comments( $post_id2, $limit );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comments = get_comments( array( 'post_id' => $post_id2 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $limit, count( $comments ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $limit, count( $comments ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $comments as $comment ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post_id2, $comment->comment_post_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1309,8 +1311,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id3 = self::factory()->post->create();

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->comment->create_post_comments( $post_id3, $limit, array( 'comment_approved' => '0' ) );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

</ins><span class="cx" style="display: block; padding: 0 10px">                 $comments = get_comments( array( 'post_id' => $post_id3 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $limit, count( $comments ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $limit, count( $comments ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $comments as $comment ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post_id3, $comment->comment_post_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1321,7 +1324,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'status'  => 'hold',

</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->assertEquals( $limit, count( $comments ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $limit, count( $comments ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $comments as $comment ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post_id3, $comment->comment_post_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1332,11 +1335,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'status'  => 'approve',

</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->assertEquals( 0, count( $comments ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, count( $comments ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->comment->create_post_comments( $post_id3, $limit, array( 'comment_approved' => '1' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $comments = get_comments( array( 'post_id' => $post_id3 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $limit * 2, count( $comments ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $limit * 2, count( $comments ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $comments as $comment ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEquals( $post_id3, $comment->comment_post_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1363,7 +1366,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'orderby'  => array( 'key' ),

</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->assertEquals( 2, count( $comments ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, count( $comments ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $comment_id2, $comments[0]->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $comment_id, $comments[1]->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1373,7 +1376,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'orderby'  => array( 'meta_value' ),

</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->assertEquals( 2, count( $comments ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, count( $comments ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $comment_id2, $comments[0]->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $comment_id, $comments[1]->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1384,7 +1387,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->assertEquals( 2, count( $comments ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, count( $comments ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $comment_id, $comments[0]->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $comment_id2, $comments[1]->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1395,7 +1398,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->assertEquals( 2, count( $comments ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, count( $comments ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $comment_id, $comments[0]->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $comment_id2, $comments[1]->comment_ID );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1423,7 +1426,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'orderby'    => array( 'key' ),

</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->assertEquals( 1, count( $comments ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $comments ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comments = get_comments(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1431,7 +1434,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'orderby'    => array( 'meta_value' ),

</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->assertEquals( 1, count( $comments ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $comments ) );

</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">@@ -1458,7 +1461,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->assertEquals( array( $comments[1], $comments[2], $comments[0] ), $found );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $comments[1], $comments[2], $comments[0] ), $found );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1502,7 +1505,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->assertEquals( array( $c3, $c1, $c2 ), $found );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $c3, $c1, $c2 ), $found );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1539,7 +1542,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->assertEquals( array( $comments[2], $comments[0], $comments[1] ), $found );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $comments[2], $comments[0], $comments[1] ), $found );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1565,7 +1568,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->assertEquals( array( $comments[2] ), $q->get_comments() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $comments[2] ), $q->get_comments() );

</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">@@ -1591,7 +1594,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->assertEquals( array( $comments[0] ), $q->get_comments() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $comments[0] ), $q->get_comments() );

</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">@@ -2896,7 +2899,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->assertEquals( 2, $found );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, $found );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2937,7 +2940,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->assertEquals( 2, $found );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, $found );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3672,7 +3675,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->assertEquals( array( $c2, $c3 ), $ids->comments );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $c2, $c3 ), $ids->comments );

</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">@@ -3689,8 +3692,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->assertEquals( 0, $q->found_comments );

-               $this->assertEquals( 0, $q->max_num_pages );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $q->found_comments );

+               $this->assertSame( 0, $q->max_num_pages );

</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">@@ -3707,8 +3710,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->assertEquals( 0, $q->found_comments );

-               $this->assertEquals( 0, $q->max_num_pages );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $q->found_comments );

+               $this->assertSame( 0, $q->max_num_pages );

</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">@@ -3725,7 +3728,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->assertEquals( 3, $q->found_comments );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 3, $q->found_comments );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 2, $q->max_num_pages );

</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">@@ -3795,7 +3798,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->assertEquals( array( $top_level_comments[0], $top_level_comments[1] ), $q->comments );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $top_level_comments[0], $top_level_comments[1] ), $q->comments );

</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">@@ -4676,7 +4679,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'count'  => 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->assertEquals( $number_of_queries + 1, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $number_of_queries + 1, $wpdb->num_queries );

</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">@@ -4705,7 +4708,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'count'  => 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->assertEquals( $number_of_queries, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $number_of_queries, $wpdb->num_queries );

</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">@@ -4733,7 +4736,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->assertEquals( $number_of_queries, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $number_of_queries, $wpdb->num_queries );

</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">@@ -4905,7 +4908,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( array( 555 ), $results );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Make sure manually setting total_users doesn't get overwritten.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $q->found_comments );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $q->found_comments );

</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 static function filter_comments_pre_query( $comments, $query ) {

</span></span></pre></div>

<a id="trunktestsphpunittestscommentslashesphp"></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/slashes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/slashes.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/comment/slashes.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,8 +43,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $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->assertEquals( wp_unslash( $this->slash_1 ), $comment->comment_author );

-               $this->assertEquals( wp_unslash( $this->slash_7 ), $comment->comment_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( wp_unslash( $this->slash_1 ), $comment->comment_author );

+               $this->assertSame( wp_unslash( $this->slash_7 ), $comment->comment_content );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $data = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID'      => $post_id,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,8 +58,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $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->assertEquals( wp_unslash( $this->slash_2 ), $comment->comment_author );

-               $this->assertEquals( wp_unslash( $this->slash_4 ), $comment->comment_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( wp_unslash( $this->slash_2 ), $comment->comment_author );

+               $this->assertSame( wp_unslash( $this->slash_4 ), $comment->comment_content );

</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">@@ -88,8 +88,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                edit_comment();

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $comment_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->assertEquals( $this->slash_1, $comment->comment_author );

-               $this->assertEquals( $this->slash_7, $comment->comment_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->slash_1, $comment->comment_author );

+               $this->assertSame( $this->slash_7, $comment->comment_content );

</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['comment_ID']              = $comment_id;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,8 +104,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                edit_comment();

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $comment_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->assertEquals( $this->slash_2, $comment->comment_author );

-               $this->assertEquals( $this->slash_4, $comment->comment_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->slash_2, $comment->comment_author );

+               $this->assertSame( $this->slash_4, $comment->comment_content );

</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">@@ -123,8 +123,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment    = get_comment( $comment_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->assertEquals( wp_unslash( $this->slash_1 ), $comment->comment_author );

-               $this->assertEquals( wp_unslash( $this->slash_7 ), $comment->comment_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( wp_unslash( $this->slash_1 ), $comment->comment_author );

+               $this->assertSame( wp_unslash( $this->slash_7 ), $comment->comment_content );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment_id = wp_insert_comment(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,8 +135,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment    = get_comment( $comment_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->assertEquals( wp_unslash( $this->slash_2 ), $comment->comment_author );

-               $this->assertEquals( wp_unslash( $this->slash_4 ), $comment->comment_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( wp_unslash( $this->slash_2 ), $comment->comment_author );

+               $this->assertSame( wp_unslash( $this->slash_4 ), $comment->comment_content );

</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">@@ -159,8 +159,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $comment_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->assertEquals( wp_unslash( $this->slash_1 ), $comment->comment_author );

-               $this->assertEquals( wp_unslash( $this->slash_7 ), $comment->comment_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( wp_unslash( $this->slash_1 ), $comment->comment_author );

+               $this->assertSame( wp_unslash( $this->slash_7 ), $comment->comment_content );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_comment(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,8 +171,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $comment_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->assertEquals( wp_unslash( $this->slash_2 ), $comment->comment_author );

-               $this->assertEquals( wp_unslash( $this->slash_4 ), $comment->comment_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( wp_unslash( $this->slash_2 ), $comment->comment_author );

+               $this->assertSame( wp_unslash( $this->slash_4 ), $comment->comment_content );

</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="trunktestsphpunittestscommenttemplatephp"></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/template.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/template.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/comment/template.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,14 +7,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_comments_number() {

</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"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 0, get_comments_number( 0 ) );

-               $this->assertEquals( 0, get_comments_number( $post_id ) );

-               $this->assertEquals( 0, get_comments_number( get_post( $post_id ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, get_comments_number( 0 ) );

+               $this->assertSame( '0', get_comments_number( $post_id ) );

+               $this->assertSame( '0', get_comments_number( get_post( $post_id ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->comment->create_post_comments( $post_id, 12 );

</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->assertEquals( 12, get_comments_number( $post_id ) );

-               $this->assertEquals( 12, get_comments_number( get_post( $post_id ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '12', get_comments_number( $post_id ) );

+               $this->assertSame( '12', get_comments_number( get_post( $post_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">        function test_get_comments_number_without_arg() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,12 +22,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $permalink = get_permalink( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( $permalink );

</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->assertEquals( 0, get_comments_number() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '0', get_comments_number() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                self::factory()->comment->create_post_comments( $post_id, 12 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( $permalink );

</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->assertEquals( 12, get_comments_number() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '12', get_comments_number() );

</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">@@ -39,13 +39,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comments_number_text = get_comments_number_text( false, false, false, $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->assertEquals( sprintf( _n( '%s Comment', '%s Comments', 6 ), '6' ), $comments_number_text );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( _n( '%s Comment', '%s Comments', 6 ), '6' ), $comments_number_text );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                ob_start();

</span><span class="cx" style="display: block; padding: 0 10px">                comments_number( false, false, false, $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $comments_number_text = ob_get_clean();

</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->assertEquals( sprintf( _n( '%s Comment', '%s Comments', 6 ), '6' ), $comments_number_text );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( _n( '%s Comment', '%s Comments', 6 ), '6' ), $comments_number_text );

</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">@@ -57,17 +57,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $permalink = get_permalink( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( $permalink );

</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->assertEquals( __( 'No Comments' ), get_comments_number_text() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( __( 'No Comments' ), get_comments_number_text() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->factory->comment->create_post_comments( $post_id, 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( $permalink );

</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->assertEquals( __( '1 Comment' ), get_comments_number_text() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( __( '1 Comment' ), get_comments_number_text() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->factory->comment->create_post_comments( $post_id, 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( $permalink );

</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->assertEquals( sprintf( _n( '%s Comment', '%s Comments', 2 ), '2' ), get_comments_number_text() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( _n( '%s Comment', '%s Comments', 2 ), '2' ), get_comments_number_text() );

</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">@@ -84,7 +84,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'gettext_with_context', array( $this, '_enable_comment_number_declension' ), 10, 4 );

</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->assertEquals( $output, get_comments_number_text( false, false, $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $output, get_comments_number_text( false, false, $input ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'gettext_with_context', array( $this, '_enable_comment_number_declension' ), 10, 4 );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestscommentwpBatchUpdateCommentTypephp"></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/wpBatchUpdateCommentType.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/wpBatchUpdateCommentType.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/comment/wpBatchUpdateCommentType.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $comment_ids as $comment_id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $updated_comment = get_comment( $comment_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 'comment', $updated_comment->comment_type );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'comment', $updated_comment->comment_type );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span></span></pre></div>

<a id="trunktestsphpunittestscommentwpCountCommentsphp"></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/wpCountComments.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/wpCountComments.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/comment/wpCountComments.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,13 +5,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_count_comments() {

</span><span class="cx" style="display: block; padding: 0 10px">                $count = wp_count_comments();

</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->assertEquals( 0, $count->approved );

-               $this->assertEquals( 0, $count->moderated );

-               $this->assertEquals( 0, $count->spam );

-               $this->assertEquals( 0, $count->trash );

-               $this->assertEquals( 0, $count->{'post-trashed'} );

-               $this->assertEquals( 0, $count->total_comments );

-               $this->assertEquals( 0, $count->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $count->approved );

+               $this->assertSame( 0, $count->moderated );

+               $this->assertSame( 0, $count->spam );

+               $this->assertSame( 0, $count->trash );

+               $this->assertSame( 0, $count->{'post-trashed'} );

+               $this->assertSame( 0, $count->total_comments );

+               $this->assertSame( 0, $count->all );

</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_count_comments_approved() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,13 +23,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $count = wp_count_comments();

</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->assertEquals( 1, $count->approved );

-               $this->assertEquals( 0, $count->moderated );

-               $this->assertEquals( 0, $count->spam );

-               $this->assertEquals( 0, $count->trash );

-               $this->assertEquals( 0, $count->{'post-trashed'} );

-               $this->assertEquals( 1, $count->total_comments );

-               $this->assertEquals( 1, $count->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $count->approved );

+               $this->assertSame( 0, $count->moderated );

+               $this->assertSame( 0, $count->spam );

+               $this->assertSame( 0, $count->trash );

+               $this->assertSame( 0, $count->{'post-trashed'} );

+               $this->assertSame( 1, $count->total_comments );

+               $this->assertSame( 1, $count->all );

</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_count_comments_awaiting() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,13 +41,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $count = wp_count_comments();

</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->assertEquals( 0, $count->approved );

-               $this->assertEquals( 1, $count->moderated );

-               $this->assertEquals( 0, $count->spam );

-               $this->assertEquals( 0, $count->trash );

-               $this->assertEquals( 0, $count->{'post-trashed'} );

-               $this->assertEquals( 1, $count->total_comments );

-               $this->assertEquals( 1, $count->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $count->approved );

+               $this->assertSame( 1, $count->moderated );

+               $this->assertSame( 0, $count->spam );

+               $this->assertSame( 0, $count->trash );

+               $this->assertSame( 0, $count->{'post-trashed'} );

+               $this->assertSame( 1, $count->total_comments );

+               $this->assertSame( 1, $count->all );

</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_count_comments_spam() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,13 +59,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $count = wp_count_comments();

</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->assertEquals( 0, $count->approved );

-               $this->assertEquals( 0, $count->moderated );

-               $this->assertEquals( 1, $count->spam );

-               $this->assertEquals( 0, $count->trash );

-               $this->assertEquals( 0, $count->{'post-trashed'} );

-               $this->assertEquals( 1, $count->total_comments );

-               $this->assertEquals( 0, $count->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $count->approved );

+               $this->assertSame( 0, $count->moderated );

+               $this->assertSame( 1, $count->spam );

+               $this->assertSame( 0, $count->trash );

+               $this->assertSame( 0, $count->{'post-trashed'} );

+               $this->assertSame( 1, $count->total_comments );

+               $this->assertSame( 0, $count->all );

</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_count_comments_trash() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,13 +77,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $count = wp_count_comments();

</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->assertEquals( 0, $count->approved );

-               $this->assertEquals( 0, $count->moderated );

-               $this->assertEquals( 0, $count->spam );

-               $this->assertEquals( 1, $count->trash );

-               $this->assertEquals( 0, $count->{'post-trashed'} );

-               $this->assertEquals( 0, $count->total_comments );

-               $this->assertEquals( 0, $count->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $count->approved );

+               $this->assertSame( 0, $count->moderated );

+               $this->assertSame( 0, $count->spam );

+               $this->assertSame( 1, $count->trash );

+               $this->assertSame( 0, $count->{'post-trashed'} );

+               $this->assertSame( 0, $count->total_comments );

+               $this->assertSame( 0, $count->all );

</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_count_comments_post_trashed() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,13 +95,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $count = wp_count_comments();

</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->assertEquals( 0, $count->approved );

-               $this->assertEquals( 0, $count->moderated );

-               $this->assertEquals( 0, $count->spam );

-               $this->assertEquals( 0, $count->trash );

-               $this->assertEquals( 1, $count->{'post-trashed'} );

-               $this->assertEquals( 0, $count->total_comments );

-               $this->assertEquals( 0, $count->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $count->approved );

+               $this->assertSame( 0, $count->moderated );

+               $this->assertSame( 0, $count->spam );

+               $this->assertSame( 0, $count->trash );

+               $this->assertSame( 1, $count->{'post-trashed'} );

+               $this->assertSame( 0, $count->total_comments );

+               $this->assertSame( 0, $count->all );

</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_count_comments_cache() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,88 +119,88 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $count1 = wp_count_comments( $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->assertEquals( 1, $count1->approved );

-               $this->assertEquals( 0, $count1->moderated );

-               $this->assertEquals( 0, $count1->spam );

-               $this->assertEquals( 0, $count1->trash );

-               $this->assertEquals( 0, $count1->{'post-trashed'} );

-               $this->assertEquals( 1, $count1->total_comments );

-               $this->assertEquals( 1, $count1->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $count1->approved );

+               $this->assertSame( 0, $count1->moderated );

+               $this->assertSame( 0, $count1->spam );

+               $this->assertSame( 0, $count1->trash );

+               $this->assertSame( 0, $count1->{'post-trashed'} );

+               $this->assertSame( 1, $count1->total_comments );

+               $this->assertSame( 1, $count1->all );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $all_count1 = wp_count_comments();

</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->assertEquals( 1, $all_count1->approved );

-               $this->assertEquals( 0, $all_count1->moderated );

-               $this->assertEquals( 0, $all_count1->spam );

-               $this->assertEquals( 0, $all_count1->trash );

-               $this->assertEquals( 0, $all_count1->{'post-trashed'} );

-               $this->assertEquals( 1, $all_count1->total_comments );

-               $this->assertEquals( 1, $all_count1->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $all_count1->approved );

+               $this->assertSame( 0, $all_count1->moderated );

+               $this->assertSame( 0, $all_count1->spam );

+               $this->assertSame( 0, $all_count1->trash );

+               $this->assertSame( 0, $all_count1->{'post-trashed'} );

+               $this->assertSame( 1, $all_count1->total_comments );

+               $this->assertSame( 1, $all_count1->all );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_spam_comment( $comment_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $count2 = wp_count_comments( $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->assertEquals( 0, $count2->approved );

-               $this->assertEquals( 0, $count2->moderated );

-               $this->assertEquals( 1, $count2->spam );

-               $this->assertEquals( 0, $count2->trash );

-               $this->assertEquals( 0, $count2->{'post-trashed'} );

-               $this->assertEquals( 1, $count2->total_comments );

-               $this->assertEquals( 0, $count2->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $count2->approved );

+               $this->assertSame( 0, $count2->moderated );

+               $this->assertSame( 1, $count2->spam );

+               $this->assertSame( 0, $count2->trash );

+               $this->assertSame( 0, $count2->{'post-trashed'} );

+               $this->assertSame( 1, $count2->total_comments );

+               $this->assertSame( 0, $count2->all );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $all_count2 = wp_count_comments();

</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->assertEquals( 0, $all_count2->approved );

-               $this->assertEquals( 0, $all_count2->moderated );

-               $this->assertEquals( 1, $all_count2->spam );

-               $this->assertEquals( 0, $all_count2->trash );

-               $this->assertEquals( 0, $all_count2->{'post-trashed'} );

-               $this->assertEquals( 1, $all_count2->total_comments );

-               $this->assertEquals( 0, $all_count2->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $all_count2->approved );

+               $this->assertSame( 0, $all_count2->moderated );

+               $this->assertSame( 1, $all_count2->spam );

+               $this->assertSame( 0, $all_count2->trash );

+               $this->assertSame( 0, $all_count2->{'post-trashed'} );

+               $this->assertSame( 1, $all_count2->total_comments );

+               $this->assertSame( 0, $all_count2->all );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_trash_comment( $comment_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $count3 = wp_count_comments( $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->assertEquals( 0, $count3->approved );

-               $this->assertEquals( 0, $count3->moderated );

-               $this->assertEquals( 0, $count3->spam );

-               $this->assertEquals( 1, $count3->trash );

-               $this->assertEquals( 0, $count3->{'post-trashed'} );

-               $this->assertEquals( 0, $count3->total_comments );

-               $this->assertEquals( 0, $count3->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $count3->approved );

+               $this->assertSame( 0, $count3->moderated );

+               $this->assertSame( 0, $count3->spam );

+               $this->assertSame( 1, $count3->trash );

+               $this->assertSame( 0, $count3->{'post-trashed'} );

+               $this->assertSame( 0, $count3->total_comments );

+               $this->assertSame( 0, $count3->all );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $all_count3 = wp_count_comments();

</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->assertEquals( 0, $all_count3->approved );

-               $this->assertEquals( 0, $all_count3->moderated );

-               $this->assertEquals( 0, $all_count3->spam );

-               $this->assertEquals( 1, $all_count3->trash );

-               $this->assertEquals( 0, $all_count3->{'post-trashed'} );

-               $this->assertEquals( 0, $all_count3->total_comments );

-               $this->assertEquals( 0, $all_count3->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $all_count3->approved );

+               $this->assertSame( 0, $all_count3->moderated );

+               $this->assertSame( 0, $all_count3->spam );

+               $this->assertSame( 1, $all_count3->trash );

+               $this->assertSame( 0, $all_count3->{'post-trashed'} );

+               $this->assertSame( 0, $all_count3->total_comments );

+               $this->assertSame( 0, $all_count3->all );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_untrash_comment( $comment_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $count4 = wp_count_comments( $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->assertEquals( 0, $count4->approved );

-               $this->assertEquals( 0, $count4->moderated );

-               $this->assertEquals( 1, $count4->spam );

-               $this->assertEquals( 0, $count4->trash );

-               $this->assertEquals( 0, $count4->{'post-trashed'} );

-               $this->assertEquals( 1, $count4->total_comments );

-               $this->assertEquals( 0, $count4->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $count4->approved );

+               $this->assertSame( 0, $count4->moderated );

+               $this->assertSame( 1, $count4->spam );

+               $this->assertSame( 0, $count4->trash );

+               $this->assertSame( 0, $count4->{'post-trashed'} );

+               $this->assertSame( 1, $count4->total_comments );

+               $this->assertSame( 0, $count4->all );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $all_count4 = wp_count_comments();

</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->assertEquals( 0, $all_count4->approved );

-               $this->assertEquals( 0, $all_count4->moderated );

-               $this->assertEquals( 1, $all_count4->spam );

-               $this->assertEquals( 0, $all_count4->trash );

-               $this->assertEquals( 0, $all_count4->{'post-trashed'} );

-               $this->assertEquals( 1, $all_count4->total_comments );

-               $this->assertEquals( 0, $all_count4->all );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $all_count4->approved );

+               $this->assertSame( 0, $all_count4->moderated );

+               $this->assertSame( 1, $all_count4->spam );

+               $this->assertSame( 0, $all_count4->trash );

+               $this->assertSame( 0, $all_count4->{'post-trashed'} );

+               $this->assertSame( 1, $all_count4->total_comments );

+               $this->assertSame( 0, $all_count4->all );

</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="trunktestsphpunittestscommentsubmissionphp"></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-submission.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment-submission.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/comment-submission.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -774,7 +774,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'preprocess_comment', array( $this, 'filter_preprocess_comment' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $comment );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'comment_post_ID'      => self::$post->ID,

</span><span class="cx" style="display: block; padding: 0 10px">                                'comment_author'       => $user->display_name,

</span></span></pre></div>

<a id="trunktestsphpunittestscommentphp"></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.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/comment.php       2020-09-02 00:35:36 UTC (rev 48937)

</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">                                'comment_parent' => $comments[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->assertEquals( 1, $result );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $result );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $comments[0] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $comments[1], $comment->comment_parent );

</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">                                'comment_parent' => $comments[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->assertEquals( 0, $result );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $result );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $result = wp_update_comment(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,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">                $comment = get_comment( $comment_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'pingback', $comment->comment_type );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'pingback', $comment->comment_type );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +109,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->assertEquals( 'fire', get_comment_meta( $comment_id, 'sauce', true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'fire', get_comment_meta( $comment_id, 'sauce', true ) );

</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">@@ -147,7 +147,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( 1, $update );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $comment_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $updated_comment_text, $comment->comment_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $updated_comment_text, $comment->comment_content );

</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">@@ -162,7 +162,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'comment_post_ID' => self::$post_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->assertSame( false, $update );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( $update );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $update = wp_update_comment(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +170,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'comment_post_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->assertSame( false, $update );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( $update );

</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,8 +290,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $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->assertEquals( $data['comment_date'], $comment->comment_date );

-               $this->assertEquals( $data['comment_date_gmt'], $comment->comment_date_gmt );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $data['comment_date'], $comment->comment_date );

+               $this->assertSame( $data['comment_date_gmt'], $comment->comment_date_gmt );

</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">@@ -312,7 +312,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $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->assertEquals( $data['comment_author_IP'], $comment->comment_author_IP );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $data['comment_author_IP'], $comment->comment_author_IP );

</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">@@ -333,7 +333,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $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->assertEquals( $data['comment_author_IP'], $comment->comment_author_IP );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $data['comment_author_IP'], $comment->comment_author_IP );

</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">@@ -355,7 +355,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $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->assertEquals( $data['comment_agent'], $comment->comment_agent );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $data['comment_agent'], $comment->comment_agent );

</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">@@ -377,7 +377,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $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->assertEquals( 'Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53 Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16 Mozilla/5.0 (Macintosh; U; PPC Mac OS ', $comment->comment_agent );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53 Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16 Mozilla/5.0 (Macintosh; U; PPC Mac OS ', $comment->comment_agent );

</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">@@ -399,7 +399,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $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->assertEquals( $data['comment_agent'], $comment->comment_agent );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $data['comment_agent'], $comment->comment_agent );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,7 +419,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $comment = get_comment( $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->assertEquals( strlen( $comment->comment_content ), 65535 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( strlen( $comment->comment_content ), 65535 );

</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">@@ -568,7 +568,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->assertEquals( 'fire', get_comment_meta( $c, 'sauce', true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'fire', get_comment_meta( $c, 'sauce', true ) );

</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="trunktestsphpunittestscompatphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/compat.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/compat.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/compat.php        2020-09-02 00:35:36 UTC (rev 48937)

</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">         * @dataProvider utf8_string_lengths

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_mb_strlen( $string, $expected_character_length ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );

</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">@@ -44,7 +44,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_mb_strlen_via_regex( $string, $expected_character_length ) {

</span><span class="cx" style="display: block; padding: 0 10px">                _wp_can_use_pcre_u( false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 _wp_can_use_pcre_u( 'reset' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider utf8_string_lengths

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_8bit_mb_strlen( $string, $expected_character_length, $expected_byte_length ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_byte_length, _mb_strlen( $string, '8bit' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_byte_length, _mb_strlen( $string, '8bit' ) );

</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">@@ -59,7 +59,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider utf8_substrings

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_mb_substr( $string, $start, $length, $expected_character_substring ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );

</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">@@ -67,7 +67,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_mb_substr_via_regex( $string, $start, $length, $expected_character_substring ) {

</span><span class="cx" style="display: block; padding: 0 10px">                _wp_can_use_pcre_u( false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 _wp_can_use_pcre_u( 'reset' );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider utf8_substrings

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_8bit_mb_substr( $string, $start, $length, $expected_character_substring, $expected_byte_substring ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_byte_substring, _mb_substr( $string, $start, $length, '8bit' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_byte_substring, _mb_substr( $string, $start, $length, '8bit' ) );

</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_mb_substr_phpcore() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,12 +83,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $string_ascii = 'ABCDEF';

</span><span class="cx" style="display: block; padding: 0 10px">                $string_mb    = base64_decode( '5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=' );

</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->assertEquals( 'DEF', _mb_substr( $string_ascii, 3 ) );

-               $this->assertEquals( 'DEF', _mb_substr( $string_ascii, 3, 5, 'ISO-8859-1' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'DEF', _mb_substr( $string_ascii, 3 ) );

+               $this->assertSame( 'DEF', _mb_substr( $string_ascii, 3, 5, 'ISO-8859-1' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Specific latin-1 as that is the default the core PHP test operates under.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'peacrOiqng==', base64_encode( _mb_substr( $string_mb, 2, 7, 'latin-1' ) ) );

-               $this->assertEquals( '6Kqe44OG44Kt44K544OI44Gn44GZ', base64_encode( _mb_substr( $string_mb, 2, 7, 'utf-8' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'peacrOiqng==', base64_encode( _mb_substr( $string_mb, 2, 7, 'latin-1' ) ) );

+               $this->assertSame( '6Kqe44OG44Kt44K544OI44Gn44GZ', base64_encode( _mb_substr( $string_mb, 2, 7, 'utf-8' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /* https://github.com/php/php-src/blob/php-5.6.8/ext/mbstring/tests/mb_substr_variation1.phpt */

</span><span class="cx" style="display: block; padding: 0 10px">                $start     = 0;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $iterator = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $inputs as $input ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $outputs[ $iterator ], _mb_substr( $input, $start, $length ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $outputs[ $iterator ], _mb_substr( $input, $start, $length ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $iterator++;

</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">@@ -165,18 +165,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_hash_hmac_simple() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '140d1cb79fa12e2a31f32d35ad0a2723', _hash_hmac( 'md5', 'simple', 'key' ) );

-               $this->assertEquals( '993003b95758e0ac2eba451a4c5877eb1bb7b92a', _hash_hmac( 'sha1', 'simple', 'key' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '140d1cb79fa12e2a31f32d35ad0a2723', _hash_hmac( 'md5', 'simple', 'key' ) );

+               $this->assertSame( '993003b95758e0ac2eba451a4c5877eb1bb7b92a', _hash_hmac( 'sha1', 'simple', 'key' ) );

</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_hash_hmac_padding() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '3c1399103807cf12ec38228614416a8c', _hash_hmac( 'md5', 'simple', '65 character key 65 character key 65 character key 65 character k' ) );

-               $this->assertEquals( '4428826d20003e309d6c2a6515891370daf184ea', _hash_hmac( 'sha1', 'simple', '65 character key 65 character key 65 character key 65 character k' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '3c1399103807cf12ec38228614416a8c', _hash_hmac( 'md5', 'simple', '65 character key 65 character key 65 character key 65 character k' ) );

+               $this->assertSame( '4428826d20003e309d6c2a6515891370daf184ea', _hash_hmac( 'sha1', 'simple', '65 character key 65 character key 65 character key 65 character 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">        function test_hash_hmac_output() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( 1 => '140d1cb79fa12e2a31f32d35ad0a2723' ), unpack( 'H32', _hash_hmac( 'md5', 'simple', 'key', true ) ) );

-               $this->assertEquals( array( 1 => '993003b95758e0ac2eba451a4c5877eb1bb7b92a' ), unpack( 'H40', _hash_hmac( 'sha1', 'simple', 'key', true ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 1 => '140d1cb79fa12e2a31f32d35ad0a2723' ), unpack( 'H32', _hash_hmac( 'md5', 'simple', 'key', true ) ) );

+               $this->assertSame( array( 1 => '993003b95758e0ac2eba451a4c5877eb1bb7b92a' ), unpack( 'H40', _hash_hmac( 'sha1', 'simple', 'key', true ) ) );

</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">@@ -186,8 +186,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                require_once ABSPATH . WPINC . '/class-json.php';

</span><span class="cx" style="display: block; padding: 0 10px">                $json = new Services_JSON();

<span class="cx" style="display: block; padding: 0 10px">                // Super basic test to verify Services_JSON is intact and working.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '["foo"]', $json->encodeUnsafe( array( 'foo' ) ) );

-               $this->assertEquals( array( 'foo' ), $json->decode( '["foo"]' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '["foo"]', $json->encodeUnsafe( array( 'foo' ) ) );

+               $this->assertSame( array( 'foo' ), $json->decode( '["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></pre></div>

<a id="trunktestsphpunittestscronphp"></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/cron.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/cron.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/cron.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,10 +43,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $scheduled = wp_schedule_single_event( $timestamp, $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $scheduled );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $timestamp, wp_next_scheduled( $hook ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $timestamp, wp_next_scheduled( $hook ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // It's a non-recurring event.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', wp_get_schedule( $hook ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( wp_get_schedule( $hook ) );

</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">@@ -59,13 +59,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $scheduled = wp_schedule_single_event( $timestamp, $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $scheduled );

<span class="cx" style="display: block; padding: 0 10px">                // This returns the timestamp only if we provide matching args.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $timestamp, wp_next_scheduled( $hook, $args ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $timestamp, wp_next_scheduled( $hook, $args ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // These don't match so return nothing.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( false, wp_next_scheduled( $hook ) );

-               $this->assertEquals( false, wp_next_scheduled( $hook, array( 'bar' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( wp_next_scheduled( $hook ) );

+               $this->assertFalse( wp_next_scheduled( $hook, array( 'bar' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // It's a non-recurring event.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', wp_get_schedule( $hook, $args ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( wp_get_schedule( $hook, $args ) );

</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_schedule_event() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,9 +77,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $scheduled = wp_schedule_event( $timestamp, $recur, $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $scheduled );

<span class="cx" style="display: block; padding: 0 10px">                // It's scheduled for the right time.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $timestamp, wp_next_scheduled( $hook ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $timestamp, wp_next_scheduled( $hook ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // It's a recurring event.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $recur, wp_get_schedule( $hook ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $recur, wp_get_schedule( $hook ) );

</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_schedule_event_args() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,12 +92,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $scheduled = wp_schedule_event( $timestamp, 'hourly', $hook, $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $scheduled );

<span class="cx" style="display: block; padding: 0 10px">                // This returns the timestamp only if we provide matching args.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $timestamp, wp_next_scheduled( $hook, $args ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $timestamp, wp_next_scheduled( $hook, $args ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // These don't match so return nothing.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( false, wp_next_scheduled( $hook ) );

-               $this->assertEquals( false, wp_next_scheduled( $hook, array( 'bar' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( wp_next_scheduled( $hook ) );

+               $this->assertFalse( wp_next_scheduled( $hook, array( 'bar' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $recur, wp_get_schedule( $hook, $args ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $recur, wp_get_schedule( $hook, $args ) );

</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">@@ -107,12 +107,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $timestamp = strtotime( '+1 hour' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_schedule_single_event( $timestamp, $hook );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $timestamp, wp_next_scheduled( $hook ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $timestamp, wp_next_scheduled( $hook ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Now unschedule it and make sure it's gone.

</span><span class="cx" style="display: block; padding: 0 10px">                $unscheduled = wp_unschedule_event( $timestamp, $hook );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $unscheduled );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( false, wp_next_scheduled( $hook ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( wp_next_scheduled( $hook ) );

</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_clear_schedule() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,7 +275,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_schedule_single_event( $ts2, $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // The next event should be at +5 minutes, not +3.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $ts1, wp_next_scheduled( $hook, $args ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $ts1, wp_next_scheduled( $hook, $args ) );

</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">@@ -294,10 +294,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( wp_schedule_single_event( $ts2, $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // The next event should be at +3 minutes, even though that one was scheduled second.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $ts2, wp_next_scheduled( $hook, $args ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $ts2, wp_next_scheduled( $hook, $args ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_unschedule_event( $ts2, $hook, $args );

<span class="cx" style="display: block; padding: 0 10px">                // Following event at +30 minutes should be there too.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $ts1, wp_next_scheduled( $hook, $args ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $ts1, wp_next_scheduled( $hook, $args ) );

</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_not_duplicate_event_reversed() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,10 +313,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( wp_schedule_single_event( $ts2, $hook, $args ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // The next event should be at +3 minutes.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $ts1, wp_next_scheduled( $hook, $args ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $ts1, wp_next_scheduled( $hook, $args ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_unschedule_event( $ts1, $hook, $args );

<span class="cx" style="display: block; padding: 0 10px">                // Following event should be there too.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $ts2, wp_next_scheduled( $hook, $args ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $ts2, wp_next_scheduled( $hook, $args ) );

</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">@@ -470,7 +470,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->assertEquals( $expected, $actual );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected->timestamp, $actual2 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected->timestamp, $actual2 );

</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 filter_pre_scheduled_event_hooks() {

</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        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/customize/custom-css-setting.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,9 +79,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_construct() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( post_type_exists( 'custom_css' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'custom_css', $this->setting->type );

-               $this->assertEquals( get_stylesheet(), $this->setting->stylesheet );

-               $this->assertEquals( 'edit_css', $this->setting->capability );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'custom_css', $this->setting->type );

+               $this->assertSame( get_stylesheet(), $this->setting->stylesheet );

+               $this->assertSame( 'edit_css', $this->setting->capability );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $exception = null;

</span><span class="cx" style="display: block; padding: 0 10px">                try {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_crud() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->setting->default = '/* Hello World */';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->setting->default, $this->setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->setting->default, $this->setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( wp_get_custom_css_post() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( wp_get_custom_css_post( $this->setting->stylesheet ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,14 +143,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_theme_mod( 'custom_css_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->assertEquals( $post_id, wp_get_custom_css_post()->ID );

-               $this->assertEquals( $post_id, wp_get_custom_css_post( $this->setting->stylesheet )->ID );

-               $this->assertEquals( $twentyten_post_id, wp_get_custom_css_post( 'twentyten' )->ID );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $post_id, wp_get_custom_css_post()->ID );

+               $this->assertSame( $post_id, wp_get_custom_css_post( $this->setting->stylesheet )->ID );

+               $this->assertSame( $twentyten_post_id, wp_get_custom_css_post( 'twentyten' )->ID );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $original_css, wp_get_custom_css( $this->setting->stylesheet ) );

-               $this->assertEquals( $original_css, $this->setting->value() );

-               $this->assertEquals( $twentyten_css, wp_get_custom_css( 'twentyten' ) );

-               $this->assertEquals( $twentyten_css, $twentyten_setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $original_css, wp_get_custom_css( $this->setting->stylesheet ) );

+               $this->assertSame( $original_css, $this->setting->value() );

+               $this->assertSame( $twentyten_css, wp_get_custom_css( 'twentyten' ) );

+               $this->assertSame( $twentyten_css, $twentyten_setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $updated_css = 'body { color: blue; }';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->wp_customize->set_post_value( $this->setting->id, $updated_css );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,15 +157,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $saved = $this->setting->save();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotFalse( $saved );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $updated_css, $this->setting->value() );

-               $this->assertEquals( $updated_css, wp_get_custom_css( $this->setting->stylesheet ) );

-               $this->assertEquals( $updated_css, get_post( $post_id )->post_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $updated_css, $this->setting->value() );

+               $this->assertSame( $updated_css, wp_get_custom_css( $this->setting->stylesheet ) );

+               $this->assertSame( $updated_css, get_post( $post_id )->post_content );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $previewed_css = 'body { color: red; }';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->wp_customize->set_post_value( $this->setting->id, $previewed_css );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->setting->preview();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $previewed_css, $this->setting->value() );

-               $this->assertEquals( $previewed_css, wp_get_custom_css( $this->setting->stylesheet ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $previewed_css, $this->setting->value() );

+               $this->assertSame( $previewed_css, wp_get_custom_css( $this->setting->stylesheet ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Make sure that wp_update_custom_css_post() works as expected for updates.

</span><span class="cx" style="display: block; padding: 0 10px">                $r = wp_update_custom_css_post(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,13 +176,13 @@

</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->assertInstanceOf( 'WP_Post', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $post_id, $r->ID );

-               $this->assertEquals( 'body { color:red; }', get_post( $r )->post_content );

-               $this->assertEquals( "body\n\tcolor:red;", get_post( $r )->post_content_filtered );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $post_id, $r->ID );

+               $this->assertSame( 'body { color:red; }', get_post( $r )->post_content );

+               $this->assertSame( "body\n\tcolor:red;", get_post( $r )->post_content_filtered );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $r = wp_update_custom_css_post( 'body { content: "\o/"; }' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->wp_customize->get_stylesheet(), get_post( $r )->post_name );

-               $this->assertEquals( 'body { content: "\o/"; }', get_post( $r )->post_content );

-               $this->assertEquals( '', get_post( $r )->post_content_filtered );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->wp_customize->get_stylesheet(), get_post( $r )->post_name );

+               $this->assertSame( 'body { content: "\o/"; }', get_post( $r )->post_content );

+               $this->assertSame( '', get_post( $r )->post_content_filtered );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Make sure that wp_update_custom_css_post() works as expected for insertion.

</span><span class="cx" style="display: block; padding: 0 10px">                $r = wp_update_custom_css_post(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,18 +192,18 @@

</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->assertInstanceOf( 'WP_Post', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'other', get_post( $r )->post_name );

-               $this->assertEquals( 'body { background:black; }', get_post( $r )->post_content );

-               $this->assertEquals( 'publish', get_post( $r )->post_status );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'other', get_post( $r )->post_name );

+               $this->assertSame( 'body { background:black; }', get_post( $r )->post_content );

+               $this->assertSame( 'publish', get_post( $r )->post_status );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test deletion.

</span><span class="cx" style="display: block; padding: 0 10px">                wp_delete_post( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( wp_get_custom_css_post() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( wp_get_custom_css_post( get_stylesheet() ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $previewed_css, wp_get_custom_css( get_stylesheet() ), 'Previewed value remains in spite of deleted post.' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $previewed_css, wp_get_custom_css( get_stylesheet() ), 'Previewed value remains in spite of deleted post.' );

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_delete_post( $twentyten_post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( wp_get_custom_css_post( 'twentyten' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', wp_get_custom_css( 'twentyten' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', wp_get_custom_css( 'twentyten' ) );

</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">@@ -271,7 +271,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_value_filter() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'customize_value_custom_css', array( $this, 'filter_value' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->setting->default = '/*default*/';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/*default*//*filtered*/', $this->setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/*default*//*filtered*/', $this->setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->factory()->post->create(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,11 +283,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_theme_mod( 'custom_css_post_id' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/*custom*//*filtered*/', $this->setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/*custom*//*filtered*/', $this->setting->value() );

</ins><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( $this->setting->id, '/*overridden*/' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->setting->preview();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/*overridden*/', $this->setting->value(), 'Expected value to not be filtered since post value is present.' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/*overridden*/', $this->setting->value(), 'Expected value to not be filtered since post value is present.' );

</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">@@ -330,7 +330,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->setting->save();

</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 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $original_title, $post->post_title );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $original_title, $post->post_title );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertContains( $overridden_css, $post->post_content );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( '/* filtered post_content */', $post->post_content );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( '/* filtered post_content_filtered */', $post->post_content_filtered );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,11 +346,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function filter_update_custom_css_data( $data, $args ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $data );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( 'css', 'preprocessed' ), array_keys( $data ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', $data['preprocessed'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', $data['preprocessed'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'array', $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( 'css', 'preprocessed', 'stylesheet' ), array_keys( $args ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $args['css'], $data['css'] );

-               $this->assertEquals( $args['preprocessed'], $data['preprocessed'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $args['css'], $data['css'] );

+               $this->assertSame( $args['preprocessed'], $data['preprocessed'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $data['css']         .= '/* filtered post_content */';

</span><span class="cx" style="display: block; padding: 0 10px">                $data['preprocessed'] = '/* filtered post_content_filtered */';

</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   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/customize/manager.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,9 +119,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'messenger_channel' => $messenger_channel,

</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->assertEquals( $uuid, $wp_customize->changeset_uuid() );

-               $this->assertEquals( $theme, $wp_customize->get_stylesheet() );

-               $this->assertEquals( $messenger_channel, $wp_customize->get_messenger_channel() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $uuid, $wp_customize->changeset_uuid() );

+               $this->assertSame( $theme, $wp_customize->get_stylesheet() );

+               $this->assertSame( $messenger_channel, $wp_customize->get_messenger_channel() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $wp_customize->autosaved() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $wp_customize->branching() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,13 +137,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_REQUEST['theme']                       = $theme;

</span><span class="cx" style="display: block; padding: 0 10px">                $_REQUEST['customize_messenger_channel'] = $messenger_channel;

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize                            = new WP_Customize_Manager( array( 'changeset_uuid' => $uuid ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $theme, $wp_customize->get_stylesheet() );

-               $this->assertEquals( $messenger_channel, $wp_customize->get_messenger_channel() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $theme, $wp_customize->get_stylesheet() );

+               $this->assertSame( $messenger_channel, $wp_customize->get_messenger_channel() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $theme                       = 'twentyfourteen';

</span><span class="cx" style="display: block; padding: 0 10px">                $_REQUEST['customize_theme'] = $theme;

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize                = new WP_Customize_Manager();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $theme, $wp_customize->get_stylesheet() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $theme, $wp_customize->get_stylesheet() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_is_uuid( $wp_customize->changeset_uuid(), 4 ) );

</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,8 +198,8 @@

<span class="cx" style="display: block; padding: 0 10px">                                'branching'      => false, // To cause drafted changeset to be autoloaded.

</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->assertEquals( $uuid2, $wp_customize->changeset_uuid() );

-               $this->assertEquals( $post_id, $wp_customize->changeset_post_id() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $uuid2, $wp_customize->changeset_uuid() );

+               $this->assertSame( $post_id, $wp_customize->changeset_post_id() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = new WP_Customize_Manager(

</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 class="cx" style="display: block; padding: 0 10px">                // Make sure that starter content import gets queued on a fresh site.

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'fresh_site', '1' );

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize->setup_theme();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 100, has_action( 'after_setup_theme', array( $wp_customize, 'import_theme_starter_content' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 100, has_action( 'after_setup_theme', array( $wp_customize, 'import_theme_starter_content' ) ) );

</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">@@ -279,7 +279,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Make sure fresh site flag is cleared when publishing a changeset.

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'fresh_site', '1' );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'customize_save_after', $wp_customize );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '0', get_option( 'fresh_site' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '0', get_option( 'fresh_site' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Simulate a new, uncached request.

</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_delete( 'alloptions', 'options' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,10 +333,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_settings_previewed() {

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = new WP_Customize_Manager( array( 'settings_previewed' => false ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( false, $wp_customize->settings_previewed() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( $wp_customize->settings_previewed() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = new WP_Customize_Manager();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( true, $wp_customize->settings_previewed() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertTrue( $wp_customize->settings_previewed() );

</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">@@ -387,7 +387,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_changeset_uuid() {

</span><span class="cx" style="display: block; padding: 0 10px">                $uuid         = wp_generate_uuid4();

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = new WP_Customize_Manager( array( 'changeset_uuid' => $uuid ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $uuid, $wp_customize->changeset_uuid() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $uuid, $wp_customize->changeset_uuid() );

</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">@@ -406,8 +406,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $title, get_option( 'blogname' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize->wp_loaded();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $wp_customize->is_preview() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $title, $wp_customize->get_setting( 'blogname' )->value() );

-               $this->assertEquals( $title, get_option( 'blogname' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $title, $wp_customize->get_setting( 'blogname' )->value() );

+               $this->assertSame( $title, get_option( 'blogname' ) );

</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">@@ -429,7 +429,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = new WP_Customize_Manager();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $wp_customize->find_changeset_post_id( wp_generate_uuid4() ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $post_id, $wp_customize->find_changeset_post_id( $uuid ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $post_id, $wp_customize->find_changeset_post_id( $uuid ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify that the found post ID was cached under the given UUID, not the manager's UUID.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $post_id, $wp_customize->find_changeset_post_id( $wp_customize->changeset_uuid() ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,7 +456,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_content' => '{}',

</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->assertEquals( $post_id, $wp_customize->changeset_post_id() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $post_id, $wp_customize->changeset_post_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">@@ -469,7 +469,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$admin_user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $uuid         = wp_generate_uuid4();

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = new WP_Customize_Manager( array( 'changeset_uuid' => $uuid ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array(), $wp_customize->changeset_data() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), $wp_customize->changeset_data() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $uuid = wp_generate_uuid4();

</span><span class="cx" style="display: block; padding: 0 10px">                $data = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +485,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">                $wp_customize = new WP_Customize_Manager( array( 'changeset_uuid' => $uuid ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $data, $wp_customize->changeset_data() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $data, $wp_customize->changeset_data() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Autosave.

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize->set_post_value( 'blogname', 'Hola Mundo' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,7 +506,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

<span class="cx" style="display: block; padding: 0 10px">                $wp_customize->register_controls(); // That is, settings.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $wp_customize->autosaved() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $data, $wp_customize->changeset_data() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $data, $wp_customize->changeset_data() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // No change to data if not requesting autosave.

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = new WP_Customize_Manager(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -517,7 +517,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $wp_customize->autosaved() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $data, $wp_customize->changeset_data() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array_merge(

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_list_pluck( $data, 'value' ),

</span><span class="cx" style="display: block; padding: 0 10px">                                array( 'blogname' => 'Hola Mundo' )

</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">                                'autosaved'      => 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->assertEquals( $data, $wp_customize->changeset_data() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $data, $wp_customize->changeset_data() );

</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">@@ -683,7 +683,7 @@

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( 'text-2', 'meta-3' ), $changeset_values['sidebars_widgets[sidebar-1]'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'text-2', 'meta-3' ), $changeset_values['sidebars_widgets[sidebar-1]'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $posts_by_name = array();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 7, $changeset_values['nav_menus_created_posts'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -693,11 +693,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $changeset_values['nav_menus_created_posts'] as $post_id ) {

</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">                        if ( $post->ID === $existing_published_home_page_id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $this->assertEquals( 'publish', $post->post_status );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $this->assertSame( 'publish', $post->post_status );

</ins><span class="cx" style="display: block; padding: 0 10px">                         } elseif ( $post->ID === $existing_canola_attachment_id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $this->assertEquals( 'inherit', $post->post_status );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $this->assertSame( 'inherit', $post->post_status );

</ins><span class="cx" style="display: block; padding: 0 10px">                         } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $this->assertEquals( 'auto-draft', $post->post_status );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $this->assertSame( 'auto-draft', $post->post_status );

</ins><span class="cx" style="display: block; padding: 0 10px">                                 $this->assertEmpty( $post->post_name );

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_name = $post->post_name;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -706,30 +706,30 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        $posts_by_name[ $post_name ] = $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->assertEquals( array( 'waffles', 'canola', 'home', 'about', 'blog', 'custom', 'unknown-cpt' ), array_keys( $posts_by_name ) );

-               $this->assertEquals( 'Custom', get_post( $posts_by_name['custom'] )->post_title );

-               $this->assertEquals( 'sample-page-template.php', get_page_template_slug( $posts_by_name['about'] ) );

-               $this->assertEquals( '', get_page_template_slug( $posts_by_name['blog'] ) );

-               $this->assertEquals( $posts_by_name['waffles'], get_post_thumbnail_id( $posts_by_name['custom'] ) );

-               $this->assertEquals( 0, get_post_thumbnail_id( $posts_by_name['blog'] ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'waffles', 'canola', 'home', 'about', 'blog', 'custom', 'unknown-cpt' ), array_keys( $posts_by_name ) );

+               $this->assertSame( 'Custom', get_post( $posts_by_name['custom'] )->post_title );

+               $this->assertSame( 'sample-page-template.php', get_page_template_slug( $posts_by_name['about'] ) );

+               $this->assertSame( '', get_page_template_slug( $posts_by_name['blog'] ) );

+               $this->assertSame( $posts_by_name['waffles'], get_post_thumbnail_id( $posts_by_name['custom'] ) );

+               $this->assertSame( 0, get_post_thumbnail_id( $posts_by_name['blog'] ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $attachment_metadata = wp_get_attachment_metadata( $posts_by_name['waffles'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Waffles', get_post( $posts_by_name['waffles'] )->post_title );

-               $this->assertEquals( 'waffles', get_post_meta( $posts_by_name['waffles'], '_customize_draft_post_name', true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Waffles', get_post( $posts_by_name['waffles'] )->post_title );

+               $this->assertSame( 'waffles', get_post_meta( $posts_by_name['waffles'], '_customize_draft_post_name', true ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'file', $attachment_metadata );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( 'waffles', $attachment_metadata['file'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'page', $changeset_values['show_on_front'] );

-               $this->assertEquals( $posts_by_name['home'], $changeset_values['page_on_front'] );

-               $this->assertEquals( $posts_by_name['blog'], $changeset_values['page_for_posts'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'page', $changeset_values['show_on_front'] );

+               $this->assertSame( $posts_by_name['home'], $changeset_values['page_on_front'] );

+               $this->assertSame( $posts_by_name['blog'], $changeset_values['page_for_posts'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( -1, $changeset_values['nav_menu_locations[top]'] );

-               $this->assertEquals( 0, $changeset_values['nav_menu_item[-1]']['object_id'] );

-               $this->assertEquals( 'custom', $changeset_values['nav_menu_item[-1]']['type'] );

-               $this->assertEquals( home_url( '/' ), $changeset_values['nav_menu_item[-1]']['url'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( -1, $changeset_values['nav_menu_locations[top]'] );

+               $this->assertSame( 0, $changeset_values['nav_menu_item[-1]']['object_id'] );

+               $this->assertSame( 'custom', $changeset_values['nav_menu_item[-1]']['type'] );

+               $this->assertSame( home_url( '/' ), $changeset_values['nav_menu_item[-1]']['url'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( $wp_customize->changeset_data() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $wp_customize->changeset_post_id() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1000, has_action( 'customize_register', array( $wp_customize, '_save_starter_content_changeset' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1000, has_action( 'customize_register', array( $wp_customize, '_save_starter_content_changeset' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 do_action( 'customize_register', $wp_customize ); // This will trigger the changeset save.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'int', $wp_customize->changeset_post_id() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $wp_customize->changeset_data() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,7 +771,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">                $changeset_data = $wp_customize->changeset_data();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $previous_blogname, $changeset_data['blogname']['value'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $previous_blogname, $changeset_data['blogname']['value'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayNotHasKey( 'starter_content', $changeset_data['blogname'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $previous_blogdescription, $changeset_data['blogdescription']['value'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'starter_content', $changeset_data['blogdescription'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -783,14 +783,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( get_theme_mod( 'custom_logo' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( get_theme_mod( 'header_image' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( get_theme_mod( 'background_image' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'auto-draft', get_post( $posts_by_name['about'] )->post_status );

-               $this->assertEquals( 'auto-draft', get_post( $posts_by_name['waffles'] )->post_status );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'auto-draft', get_post( $posts_by_name['about'] )->post_status );

+               $this->assertSame( 'auto-draft', get_post( $posts_by_name['waffles'] )->post_status );

</ins><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><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'publish', get_post( $posts_by_name['about'] )->post_status );

-               $this->assertEquals( 'inherit', get_post( $posts_by_name['waffles'] )->post_status );

-               $this->assertEquals( $changeset_data['blogname']['value'], get_option( 'blogname' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'publish', get_post( $posts_by_name['about'] )->post_status );

+               $this->assertSame( 'inherit', get_post( $posts_by_name['waffles'] )->post_status );

+               $this->assertSame( $changeset_data['blogname']['value'], get_option( 'blogname' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEmpty( get_theme_mod( 'custom_logo' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( get_theme_mod( 'header_image' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( get_theme_mod( 'background_image' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -800,7 +800,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( 'canola', get_custom_logo() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( 'waffles', get_header_image() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( 'waffles', get_background_image() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'waffles', get_post( $posts_by_name['waffles'] )->post_name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'waffles', get_post( $posts_by_name['waffles'] )->post_name );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEmpty( get_post_meta( $posts_by_name['waffles'], '_customize_draft_post_name', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -891,15 +891,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $did_action_customize_preview_init = did_action( 'customize_preview_init' );

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize                      = new WP_Customize_Manager();

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize->customize_preview_init();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $did_action_customize_preview_init + 1, did_action( 'customize_preview_init' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $did_action_customize_preview_init + 1, did_action( 'customize_preview_init' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 10, has_action( 'wp_head', 'wp_no_robots' ) );

-               $this->assertEquals( 10, has_action( 'wp_head', array( $wp_customize, 'remove_frameless_preview_messenger_channel' ) ) );

-               $this->assertEquals( 10, has_filter( 'wp_headers', array( $wp_customize, 'filter_iframe_security_headers' ) ) );

-               $this->assertEquals( 10, has_filter( 'wp_redirect', array( $wp_customize, 'add_state_query_params' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_action( 'wp_head', 'wp_no_robots' ) );

+               $this->assertSame( 10, has_action( 'wp_head', array( $wp_customize, 'remove_frameless_preview_messenger_channel' ) ) );

+               $this->assertSame( 10, has_filter( 'wp_headers', array( $wp_customize, 'filter_iframe_security_headers' ) ) );

+               $this->assertSame( 10, has_filter( 'wp_redirect', array( $wp_customize, 'add_state_query_params' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( wp_script_is( 'customize-preview', 'enqueued' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 10, has_action( 'wp_head', array( $wp_customize, 'customize_preview_loading_style' ) ) );

-               $this->assertEquals( 20, has_action( 'wp_footer', array( $wp_customize, 'customize_preview_settings' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_action( 'wp_head', array( $wp_customize, 'customize_preview_loading_style' ) ) );

+               $this->assertSame( 20, has_action( 'wp_footer', array( $wp_customize, 'customize_preview_settings' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test unauthorized user outside preview (no messenger_channel).

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$subscriber_user_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -934,8 +934,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $headers      = $wp_customize->filter_iframe_security_headers( array() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'X-Frame-Options', $headers );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'Content-Security-Policy', $headers );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'SAMEORIGIN', $headers['X-Frame-Options'] );

-               $this->assertEquals( "frame-ancestors 'self'", $headers['Content-Security-Policy'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'SAMEORIGIN', $headers['X-Frame-Options'] );

+               $this->assertSame( "frame-ancestors 'self'", $headers['Content-Security-Policy'] );

</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">@@ -961,8 +961,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'customize_messenger_channel', $query_params );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'customize_changeset_uuid', $query_params );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayNotHasKey( 'customize_theme', $query_params );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $uuid, $query_params['customize_changeset_uuid'] );

-               $this->assertEquals( $messenger_channel, $query_params['customize_messenger_channel'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $uuid, $query_params['customize_changeset_uuid'] );

+               $this->assertSame( $messenger_channel, $query_params['customize_messenger_channel'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $uuid         = wp_generate_uuid4();

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = new WP_Customize_Manager(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -978,8 +978,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayNotHasKey( 'customize_messenger_channel', $query_params );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'customize_changeset_uuid', $query_params );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'customize_theme', $query_params );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $uuid, $query_params['customize_changeset_uuid'] );

-               $this->assertEquals( $preview_theme, $query_params['customize_theme'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $uuid, $query_params['customize_changeset_uuid'] );

+               $this->assertSame( $preview_theme, $query_params['customize_theme'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $uuid         = wp_generate_uuid4();

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = new WP_Customize_Manager(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1043,23 +1043,23 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $r );

</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->assertEquals( $did_action['customize_save_validation_before'] + 1, did_action( 'customize_save_validation_before' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $did_action['customize_save_validation_before'] + 1, did_action( 'customize_save_validation_before' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = $manager->find_changeset_post_id( $uuid );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotNull( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $saved_data = json_decode( get_post( $post_id )->post_content, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $manager->unsanitized_post_values(), wp_list_pluck( $saved_data, 'value' ) );

-               $this->assertEquals( $pre_saved_data['blogname']['value'], $saved_data['blogname']['value'] );

-               $this->assertEquals( $pre_saved_data['blogdescription']['custom'], $saved_data['blogdescription']['custom'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $manager->unsanitized_post_values(), wp_list_pluck( $saved_data, 'value' ) );

+               $this->assertSame( $pre_saved_data['blogname']['value'], $saved_data['blogname']['value'] );

+               $this->assertSame( $pre_saved_data['blogdescription']['custom'], $saved_data['blogdescription']['custom'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $saved_data as $setting_id => $setting_params ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertArrayHasKey( 'type', $setting_params );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 'option', $setting_params['type'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'option', $setting_params['type'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertArrayHasKey( 'user_id', $setting_params );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( self::$admin_user_id, $setting_params['user_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( self::$admin_user_id, $setting_params['user_id'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Auto Draft', get_post( $post_id )->post_title );

-               $this->assertEquals( 'auto-draft', get_post( $post_id )->post_status );

-               $this->assertEquals( $date, get_post( $post_id )->post_date_gmt );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Auto Draft', get_post( $post_id )->post_title );

+               $this->assertSame( 'auto-draft', get_post( $post_id )->post_status );

+               $this->assertSame( $date, get_post( $post_id )->post_date_gmt );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEquals( 'Changeset Title', get_option( 'blogname' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'setting_validities', $r );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1097,7 +1097,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->assertInstanceOf( 'WP_Error', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'transaction_fail', $r->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'transaction_fail', $r->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'array', $r->get_error_data() );

</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1105,16 +1105,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $error_data['setting_validities']['blogname'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'foo_unauthorized', $error_data['setting_validities'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $error_data['setting_validities']['foo_unauthorized'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'unauthorized', $error_data['setting_validities']['foo_unauthorized']->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'unauthorized', $error_data['setting_validities']['foo_unauthorized']->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'bar_unknown', $error_data['setting_validities'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $error_data['setting_validities']['bar_unknown'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'unrecognized', $error_data['setting_validities']['bar_unknown']->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'unrecognized', $error_data['setting_validities']['bar_unknown']->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'baz_illegal', $error_data['setting_validities'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $error_data['setting_validities']['baz_illegal'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'illegal', $error_data['setting_validities']['baz_illegal']->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'illegal', $error_data['setting_validities']['baz_illegal']->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Since transactional, ensure no changes have been made.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $previous_saved_data, json_decode( get_post( $post_id )->post_content, true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $previous_saved_data, json_decode( get_post( $post_id )->post_content, true ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Attempt a non-transactional/incremental update.

</span><span class="cx" style="display: block; padding: 0 10px">                $manager      = new WP_Customize_Manager(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1143,7 +1143,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $r['setting_validities']['bar_unknown'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $saved_data = json_decode( get_post( $post_id )->post_content, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $previous_saved_data, $saved_data );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Non-Transactional \o/ <script>unsanitized</script>', $saved_data['blogname']['value'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Non-Transactional \o/ <script>unsanitized</script>', $saved_data['blogname']['value'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure the filter applies.

</span><span class="cx" style="display: block; padding: 0 10px">                $customize_changeset_save_data_call_count = $this->customize_changeset_save_data_call_count;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1158,7 +1158,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->assertEquals( $customize_changeset_save_data_call_count + 1, $this->customize_changeset_save_data_call_count );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $customize_changeset_save_data_call_count + 1, $this->customize_changeset_save_data_call_count );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Publish the changeset: actions will be doubled since also trashed.

</span><span class="cx" style="display: block; padding: 0 10px">                $expected_actions = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1205,17 +1205,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Do it live \o/', get_option( 'blogname' ) );

-               $this->assertEquals( 'trash', get_post_status( $post_id ) ); // Auto-trashed.

-               $this->assertEquals( $original_capabilities, wp_list_pluck( $manager->settings(), 'capability' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Do it live \o/', get_option( 'blogname' ) );

+               $this->assertSame( 'trash', get_post_status( $post_id ) ); // Auto-trashed.

+               $this->assertSame( $original_capabilities, wp_list_pluck( $manager->settings(), 'capability' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertContains( '<script>', get_post( $post_id )->post_content );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $manager->changeset_uuid(), get_post( $post_id )->post_name, 'Expected that the "__trashed" suffix to not be added.' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $manager->changeset_uuid(), get_post( $post_id )->post_name, 'Expected that the "__trashed" suffix to not be added.' );

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( self::$admin_user_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'publish', get_post_meta( $post_id, '_wp_trash_meta_status', true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'publish', get_post_meta( $post_id, '_wp_trash_meta_status', true ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( is_numeric( get_post_meta( $post_id, '_wp_trash_meta_time', true ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( array_keys( $expected_actions ) as $action_name ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected_actions[ $action_name ] + $action_counts[ $action_name ], did_action( $action_name ), "Action: $action_name" );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected_actions[ $action_name ] + $action_counts[ $action_name ], did_action( $action_name ), "Action: $action_name" );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test revisions.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1293,8 +1293,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $autosave_revision = wp_get_post_autosave( $wp_customize->changeset_post_id(), get_current_user_id() );

</span><span class="cx" style="display: block; padding: 0 10px">                $saved_data        = json_decode( $autosave_revision->post_content, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $options['custom_html_1'], $saved_data['custom_html_1']['value'] );

-               $this->assertEquals( $options['custom_html_2'], $saved_data['custom_html_2']['value'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $options['custom_html_1'], $saved_data['custom_html_1']['value'] );

+               $this->assertSame( $options['custom_html_2'], $saved_data['custom_html_2']['value'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Update post to discard autosave.

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize->save_changeset_post(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1309,8 +1309,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                 */

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = $this->get_manager_for_testing_json_corruption_protection( $uuid );

</span><span class="cx" style="display: block; padding: 0 10px">                $saved_data   = json_decode( get_post( $wp_customize->changeset_post_id() )->post_content, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $options['custom_html_1'], $saved_data['custom_html_1']['value'] );

-               $this->assertEquals( $options['custom_html_2'], $saved_data['custom_html_2']['value'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $options['custom_html_1'], $saved_data['custom_html_1']['value'] );

+               $this->assertSame( $options['custom_html_2'], $saved_data['custom_html_2']['value'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /*

<span class="cx" style="display: block; padding: 0 10px">                 * Ensure that the unsanitized value (the "POST data") is preserved in the revisions' content.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1319,8 +1319,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $revisions  = wp_get_post_revisions( $wp_customize->changeset_post_id() );

</span><span class="cx" style="display: block; padding: 0 10px">                $revision   = array_shift( $revisions );

</span><span class="cx" style="display: block; padding: 0 10px">                $saved_data = json_decode( $revision->post_content, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $options['custom_html_1'], $saved_data['custom_html_1']['value'] );

-               $this->assertEquals( $options['custom_html_2'], $saved_data['custom_html_2']['value'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $options['custom_html_1'], $saved_data['custom_html_1']['value'] );

+               $this->assertSame( $options['custom_html_2'], $saved_data['custom_html_2']['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">                 * Now when publishing the changeset, the unsanitized values will be read from the changeset

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1476,9 +1476,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post_values = $manager->unsanitized_post_values();

</span><span class="cx" style="display: block; padding: 0 10px">                $manager->save_changeset_post( array( 'status' => 'publish' ) ); // Activate.

</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->assertEquals( '#123456', $post_values['background_color'] );

-               $this->assertEquals( $preview_theme, get_stylesheet() );

-               $this->assertEquals( 'Hello Preview Theme', get_option( 'blogname' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '#123456', $post_values['background_color'] );

+               $this->assertSame( $preview_theme, get_stylesheet() );

+               $this->assertSame( 'Hello Preview Theme', get_option( 'blogname' ) );

</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">@@ -1513,15 +1513,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><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="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = $wp_customize->find_changeset_post_id( $uuid );

</span><span class="cx" style="display: block; padding: 0 10px">                $data    = json_decode( get_post( $post_id )->post_content, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( self::$admin_user_id, $data['blogname']['user_id'] );

-               $this->assertEquals( self::$admin_user_id, $data['scratchpad']['user_id'] );

-               $this->assertEquals( self::$admin_user_id, $data[ $this->manager->get_stylesheet() . '::background_color' ]['user_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( self::$admin_user_id, $data['blogname']['user_id'] );

+               $this->assertSame( self::$admin_user_id, $data['scratchpad']['user_id'] );

+               $this->assertSame( self::$admin_user_id, $data[ $this->manager->get_stylesheet() . '::background_color' ]['user_id'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Attempt to save just one setting under a different user.

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( $other_admin_user_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1540,17 +1540,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><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="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $data = json_decode( get_post( $post_id )->post_content, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Admin 2 Title', $data['blogname']['value'] );

-               $this->assertEquals( $other_admin_user_id, $data['blogname']['user_id'] );

-               $this->assertEquals( 'Admin 1 Scratch', $data['scratchpad']['value'] );

-               $this->assertEquals( self::$admin_user_id, $data['scratchpad']['user_id'] );

-               $this->assertEquals( '#FFFFFF', $data[ $this->manager->get_stylesheet() . '::background_color' ]['value'] );

-               $this->assertEquals( $other_admin_user_id, $data[ $this->manager->get_stylesheet() . '::background_color' ]['user_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Admin 2 Title', $data['blogname']['value'] );

+               $this->assertSame( $other_admin_user_id, $data['blogname']['user_id'] );

+               $this->assertSame( 'Admin 1 Scratch', $data['scratchpad']['value'] );

+               $this->assertSame( self::$admin_user_id, $data['scratchpad']['user_id'] );

+               $this->assertSame( '#FFFFFF', $data[ $this->manager->get_stylesheet() . '::background_color' ]['value'] );

+               $this->assertSame( $other_admin_user_id, $data[ $this->manager->get_stylesheet() . '::background_color' ]['user_id'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Attempt to save now as under-privileged user.

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = $this->create_test_manager( $uuid );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1569,14 +1569,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">                $this->assertInternalType( 'array', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

-                       array_fill_keys( array( 'scratchpad', 'blogname' ), true ),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

+                       array_fill_keys( array( 'blogname', 'scratchpad' ), true ),

</ins><span class="cx" style="display: block; padding: 0 10px">                         $r['setting_validities']

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $data = json_decode( get_post( $post_id )->post_content, true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $other_admin_user_id, $data['blogname']['user_id'], 'Expected setting to be untouched.' );

-               $this->assertEquals( self::$subscriber_user_id, $data['scratchpad']['user_id'] );

-               $this->assertEquals( $other_admin_user_id, $data[ $this->manager->get_stylesheet() . '::background_color' ]['user_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $other_admin_user_id, $data['blogname']['user_id'], 'Expected setting to be untouched.' );

+               $this->assertSame( self::$subscriber_user_id, $data['scratchpad']['user_id'] );

+               $this->assertSame( $other_admin_user_id, $data[ $this->manager->get_stylesheet() . '::background_color' ]['user_id'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Manually update the changeset so that the user_id context is not included.

</span><span class="cx" style="display: block; padding: 0 10px">                $data                             = json_decode( get_post( $post_id )->post_content, true );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1609,14 +1609,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( array_keys( $data ) as $setting_id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $setting_id = preg_replace( '/^.+::/', '', $setting_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $save_counts[ $setting_id ] + 1, did_action( sprintf( 'customize_save_%s', $setting_id ) ), $setting_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $save_counts[ $setting_id ] + 1, did_action( sprintf( 'customize_save_%s', $setting_id ) ), $setting_id );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array( 'blogname', 'blogdescription', 'background_color', 'scratchpad' ), array_keys( $this->filtered_setting_current_user_ids ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $other_admin_user_id, $this->filtered_setting_current_user_ids['blogname'] );

-               $this->assertEquals( 0, $this->filtered_setting_current_user_ids['blogdescription'] );

-               $this->assertEquals( self::$subscriber_user_id, $this->filtered_setting_current_user_ids['scratchpad'] );

-               $this->assertEquals( $other_admin_user_id, $this->filtered_setting_current_user_ids['background_color'] );

-               $this->assertEquals( 'Subscriber Scratch', get_option( 'scratchpad' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $other_admin_user_id, $this->filtered_setting_current_user_ids['blogname'] );

+               $this->assertSame( 0, $this->filtered_setting_current_user_ids['blogdescription'] );

+               $this->assertSame( self::$subscriber_user_id, $this->filtered_setting_current_user_ids['scratchpad'] );

+               $this->assertSame( $other_admin_user_id, $this->filtered_setting_current_user_ids['background_color'] );

+               $this->assertSame( 'Subscriber Scratch', get_option( 'scratchpad' ) );

</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">@@ -1746,10 +1746,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $r['setting_validities']['unknownsetting'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'unrecognized', $r['setting_validities']['unknownsetting']->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'unrecognized', $r['setting_validities']['unknownsetting']->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInstanceOf( 'WP_Error', $r['setting_validities']['blogterminated'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'unauthorized', $r['setting_validities']['blogterminated']->get_error_code() );

-               $this->assertEquals( $data, get_post( $wp_customize->changeset_post_id() )->post_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'unauthorized', $r['setting_validities']['blogterminated']->get_error_code() );

+               $this->assertSame( $data, get_post( $wp_customize->changeset_post_id() )->post_content );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test submitting data with changed and unchanged settings, creating a new instance so that the post_values are cleared.

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( $other_admin_user_id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1776,14 +1776,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Note that blogfounded is not included among setting_validities because no value was supplied and it is not unrecognized/unauthorized.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array_fill_keys( array( 'blogname', 'blogdescription', 'scratchpad' ), true ), $r['setting_validities'], 'Expected blogname even though unchanged.' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array_fill_keys( array( 'blogname', 'blogdescription', 'scratchpad' ), true ), $r['setting_validities'], 'Expected blogname even though unchanged.' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $data = json_decode( get_post( $wp_customize->changeset_post_id() )->post_content, 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->assertEquals( self::$admin_user_id, $data['blogname']['user_id'], 'Expected unchanged user_id since value was unchanged.' );

-               $this->assertEquals( $other_admin_user_id, $data['blogdescription']['user_id'] );

-               $this->assertEquals( $other_admin_user_id, $data['blogfounded']['user_id'] );

-               $this->assertEquals( $other_admin_user_id, $data['scratchpad']['user_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( self::$admin_user_id, $data['blogname']['user_id'], 'Expected unchanged user_id since value was unchanged.' );

+               $this->assertSame( $other_admin_user_id, $data['blogdescription']['user_id'] );

+               $this->assertSame( $other_admin_user_id, $data['blogfounded']['user_id'] );

+               $this->assertSame( $other_admin_user_id, $data['scratchpad']['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">@@ -1855,7 +1855,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->assertInstanceOf( 'WP_Error', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'illegal_autosave_with_date_gmt', $r->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'illegal_autosave_with_date_gmt', $r->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Fail: illegal_autosave_with_status.

</span><span class="cx" style="display: block; padding: 0 10px">                $r = $wp_customize->save_changeset_post(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1864,7 +1864,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'status'   => 'pending',

</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->assertEquals( 'illegal_autosave_with_status', $r->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'illegal_autosave_with_status', $r->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Fail: illegal_autosave_with_non_current_user.

</span><span class="cx" style="display: block; padding: 0 10px">                $r = $wp_customize->save_changeset_post(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1873,7 +1873,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'user_id'  => $this->factory()->user->create( array( 'role' => 'administrator' ) ),

</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->assertEquals( 'illegal_autosave_with_non_current_user', $r->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'illegal_autosave_with_non_current_user', $r->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Try autosave.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_get_post_autosave( $changeset_post_id, get_current_user_id() ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1960,7 +1960,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = new WP_Customize_Manager( array( 'changeset_uuid' => $wp_customize->changeset_uuid() ) );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'customize_register', $wp_customize );

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize->save_changeset_post( array( 'status' => 'publish' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Unfiltered<script>evil</script>', get_option( 'scratchpad' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Unfiltered<script>evil</script>', get_option( 'scratchpad' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Attempt scratchpad with user who doesn't have unfiltered_html.

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'scratchpad', '' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1976,7 +1976,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = new WP_Customize_Manager( array( 'changeset_uuid' => $wp_customize->changeset_uuid() ) );

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'customize_register', $wp_customize );

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize->save_changeset_post( array( 'status' => 'publish' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Unfilteredevil', get_option( 'scratchpad' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Unfilteredevil', get_option( 'scratchpad' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Attempt publishing scratchpad as anonymous user when changeset was set by privileged user.

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'scratchpad', '' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1993,9 +1993,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize = null;

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $GLOBALS['wp_actions']['customize_register'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Unfilteredevil', apply_filters( 'content_save_pre', 'Unfiltered<script>evil</script>' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Unfilteredevil', apply_filters( 'content_save_pre', 'Unfiltered<script>evil</script>' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_publish_post( $changeset_post_id ); // @todo If wp_update_post() is used here, then kses will corrupt the post_content.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Unfiltered<script>evil</script>', get_option( 'scratchpad' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Unfiltered<script>evil</script>', get_option( 'scratchpad' ) );

</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">@@ -2047,7 +2047,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure that the value has actually been written to the DB.

</span><span class="cx" style="display: block; padding: 0 10px">                $updated_sidebars_widgets = get_option( 'sidebars_widgets' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $new_sidebar_1, $updated_sidebars_widgets['sidebar-1'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $new_sidebar_1, $updated_sidebars_widgets['sidebar-1'] );

</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">@@ -2099,7 +2099,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $r = $manager->save_changeset_post( $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'json_parse_error', $r->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'json_parse_error', $r->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2109,7 +2109,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $r = $manager->save_changeset_post( $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'expected_array', $r->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'expected_array', $r->get_error_code() );

</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">@@ -2217,7 +2217,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( is_ssl() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $wp_customize->is_cross_domain() );

</span><span class="cx" style="display: block; padding: 0 10px">                $allowed = $wp_customize->get_allowed_urls();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $allowed, array( home_url( '/', 'http' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $allowed, array( home_url( '/', 'http' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'customize_allowed_urls', array( $this, 'filter_customize_allowed_urls' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $allowed = $wp_customize->get_allowed_urls();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2276,12 +2276,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['customized'] = wp_slash( wp_json_encode( $customized ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_values         = $manager->unsanitized_post_values();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $customized, $post_values );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $customized, $post_values );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEmpty( $manager->unsanitized_post_values( array( 'exclude_post_data' => true ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $manager->set_post_value( 'foo', 'BAR' );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_values = $manager->unsanitized_post_values();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'BAR', $post_values['foo'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'BAR', $post_values['foo'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEmpty( $manager->unsanitized_post_values( array( 'exclude_post_data' => true ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // If user is unprivileged, the post data is ignored.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2345,7 +2345,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayNotHasKey( 'background_color', $manager->unsanitized_post_values() );

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'blogname'        => 'Changeset Title',

</span><span class="cx" style="display: block; padding: 0 10px">                                'blogdescription' => 'Post Input Tagline',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2352,7 +2352,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $manager->unsanitized_post_values()

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'blogdescription' => 'Post Input Tagline',

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2360,7 +2360,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">                $manager->set_post_value( 'blogdescription', 'Post Override Tagline' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'blogname'        => 'Changeset Title',

</span><span class="cx" style="display: block; padding: 0 10px">                                'blogdescription' => 'Post Override Tagline',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2368,7 +2368,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $manager->unsanitized_post_values()

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'blogname'        => 'Changeset Title',

</span><span class="cx" style="display: block; padding: 0 10px">                                'blogdescription' => 'Changeset Tagline',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2401,7 +2401,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $values );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'background_color', $values );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '#000000', $values['background_color'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '#000000', $values['background_color'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $values = $manager->unsanitized_post_values(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2430,12 +2430,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $manager->add_setting( 'foo', array( 'default' => 'foo_default' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $foo_setting = $manager->get_setting( 'foo' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foo_default', $manager->get_setting( 'foo' )->value(), 'Expected non-previewed setting to return default when value() method called.' );

-               $this->assertEquals( $posted_settings['foo'], $manager->post_value( $foo_setting, 'post_value_foo_default' ), 'Expected post_value($foo_setting) to return value supplied in $_POST[customized][foo]' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foo_default', $manager->get_setting( 'foo' )->value(), 'Expected non-previewed setting to return default when value() method called.' );

+               $this->assertSame( $posted_settings['foo'], $manager->post_value( $foo_setting, 'post_value_foo_default' ), 'Expected post_value($foo_setting) to return value supplied in $_POST[customized][foo]' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $manager->add_setting( 'bar', array( 'default' => 'bar_default' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $bar_setting = $manager->get_setting( 'bar' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'post_value_bar_default', $manager->post_value( $bar_setting, 'post_value_bar_default' ), 'Expected post_value($bar_setting, $default) to return $default since no value supplied in $_POST[customized][bar]' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'post_value_bar_default', $manager->post_value( $bar_setting, 'post_value_bar_default' ), 'Expected post_value($bar_setting, $default) to return $default since no value supplied in $_POST[customized][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">@@ -2453,26 +2453,26 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'sanitize_callback' => array( $this, 'filter_customize_sanitize_foo' ),

</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->assertEquals( $default_value, $this->manager->post_value( $setting, $default_value ) );

-               $this->assertEquals( $default_value, $setting->post_value( $default_value ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $default_value, $this->manager->post_value( $setting, $default_value ) );

+               $this->assertSame( $default_value, $setting->post_value( $default_value ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_value = 'bar';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( 'foo', $post_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( strtoupper( $post_value ), $this->manager->post_value( $setting, $default_value ) );

-               $this->assertEquals( strtoupper( $post_value ), $setting->post_value( $default_value ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( strtoupper( $post_value ), $this->manager->post_value( $setting, $default_value ) );

+               $this->assertSame( strtoupper( $post_value ), $setting->post_value( $default_value ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( 'foo', 'return_wp_error_in_sanitize' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $default_value, $this->manager->post_value( $setting, $default_value ) );

-               $this->assertEquals( $default_value, $setting->post_value( $default_value ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $default_value, $this->manager->post_value( $setting, $default_value ) );

+               $this->assertSame( $default_value, $setting->post_value( $default_value ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( 'foo', 'return_null_in_sanitize' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $default_value, $this->manager->post_value( $setting, $default_value ) );

-               $this->assertEquals( $default_value, $setting->post_value( $default_value ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $default_value, $this->manager->post_value( $setting, $default_value ) );

+               $this->assertSame( $default_value, $setting->post_value( $default_value ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_value = '<script>evil</script>';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( 'foo', $post_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $default_value, $this->manager->post_value( $setting, $default_value ) );

-               $this->assertEquals( $default_value, $setting->post_value( $default_value ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $default_value, $this->manager->post_value( $setting, $default_value ) );

+               $this->assertSame( $default_value, $setting->post_value( $default_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2522,8 +2522,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'sanitize_callback' => array( $this, 'filter_customize_sanitize_numeric' ),

</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->assertEquals( $default_value, $this->manager->post_value( $setting, $default_value ) );

-               $this->assertEquals( $default_value, $setting->post_value( $default_value ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $default_value, $this->manager->post_value( $setting, $default_value ) );

+               $this->assertSame( $default_value, $setting->post_value( $default_value ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_value = '42';

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( 'numeric', $post_value );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2574,7 +2574,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( 'foo', $post_value );

</span><span class="cx" style="display: block; padding: 0 10px">                $validities = $this->manager->validate_setting_values( $this->manager->unsanitized_post_values() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 1, $validities );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( 'foo' => true ), $validities );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'foo' => true ), $validities );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( 'foo', 'return_wp_error_in_sanitize' );

</span><span class="cx" style="display: block; padding: 0 10px">                $invalid_settings = $this->manager->validate_setting_values( $this->manager->unsanitized_post_values() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2582,8 +2582,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( $setting->id, $invalid_settings );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $invalid_settings[ $setting->id ] );

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $invalid_settings[ $setting->id ];

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'invalid_value_in_sanitize', $error->get_error_code() );

-               $this->assertEquals( array( 'source' => 'filter_customize_sanitize_foo' ), $error->get_error_data() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_value_in_sanitize', $error->get_error_code() );

+               $this->assertSame( array( 'source' => 'filter_customize_sanitize_foo' ), $error->get_error_data() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( 'foo', 'return_null_in_sanitize' );

</span><span class="cx" style="display: block; padding: 0 10px">                $invalid_settings = $this->manager->validate_setting_values( $this->manager->unsanitized_post_values() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2599,8 +2599,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( $setting->id, $invalid_settings );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $invalid_settings[ $setting->id ] );

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $invalid_settings[ $setting->id ];

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'invalid_value_in_validate', $error->get_error_code() );

-               $this->assertEquals( array( 'source' => 'filter_customize_validate_foo' ), $error->get_error_data() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_value_in_validate', $error->get_error_code() );

+               $this->assertSame( array( 'source' => 'filter_customize_validate_foo' ), $error->get_error_data() );

</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">@@ -2626,7 +2626,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $setting_validities = $this->manager->validate_setting_values( array( $setting->id => 'bad' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $validity           = $setting_validities[ $setting->id ];

</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->assertEquals( 'minlength', $validity->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'minlength', $validity->get_error_code() );

</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">@@ -2650,7 +2650,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'unknown', $validities );

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $validities['unknown'];

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'unrecognized', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'unrecognized', $error->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->get_setting( 'blogname' )->capability = 'do_not_allow';

</span><span class="cx" style="display: block; padding: 0 10px">                $validities = $this->manager->validate_setting_values( array( 'blogname' => 'X' ), array( 'validate_capability' => false ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2660,7 +2660,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'blogname', $validities );

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $validities['blogname'];

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'unauthorized', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'unauthorized', $error->get_error_code() );

</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">@@ -2699,7 +2699,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( 'numeric', $post_value );

</span><span class="cx" style="display: block; padding: 0 10px">                $validities = $this->manager->validate_setting_values( $this->manager->unsanitized_post_values() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 1, $validities );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( 'numeric' => true ), $validities );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'numeric' => true ), $validities );

</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">@@ -2718,12 +2718,12 @@

</span><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><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInternalType( 'array', $validity[ $code ] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( join( ' ', $messages ), $validity[ $code ]['message'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( join( ' ', $messages ), $validity[ $code ]['message'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertArrayHasKey( 'data', $validity[ $code ] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $validity[ $code ]['data'], $error->get_error_data( $code ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $validity[ $code ]['data'], $error->get_error_data( $code ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'number', $validity['bad_number']['data'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 123, $validity['bad_number']['data']['number'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 123, $validity['bad_number']['data']['number'] );

</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">@@ -2746,16 +2746,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'customize_post_value_set_foo', array( $this, 'capture_customize_post_value_set_actions' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( $setting->id, '123abc' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 2, $this->captured_customize_post_value_set_actions );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'customize_post_value_set_foo', $this->captured_customize_post_value_set_actions[0]['action'] );

-               $this->assertEquals( 'customize_post_value_set', $this->captured_customize_post_value_set_actions[1]['action'] );

-               $this->assertEquals( array( '123abc', $this->manager ), $this->captured_customize_post_value_set_actions[0]['args'] );

-               $this->assertEquals( array( $setting->id, '123abc', $this->manager ), $this->captured_customize_post_value_set_actions[1]['args'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'customize_post_value_set_foo', $this->captured_customize_post_value_set_actions[0]['action'] );

+               $this->assertSame( 'customize_post_value_set', $this->captured_customize_post_value_set_actions[1]['action'] );

+               $this->assertSame( array( '123abc', $this->manager ), $this->captured_customize_post_value_set_actions[0]['args'] );

+               $this->assertSame( array( $setting->id, '123abc', $this->manager ), $this->captured_customize_post_value_set_actions[1]['args'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $unsanitized = $this->manager->unsanitized_post_values();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( $setting->id, $unsanitized );

</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->assertEquals( '123abc', $unsanitized[ $setting->id ] );

-               $this->assertEquals( 123, $setting->post_value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '123abc', $unsanitized[ $setting->id ] );

+               $this->assertSame( 123, $setting->post_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2806,8 +2806,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->action_customize_register_for_dynamic_settings();

</span><span class="cx" style="display: block; padding: 0 10px">                $manager->add_dynamic_settings( $setting_ids );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $manager->get_setting( 'bar' ), 'Expected bar setting to be created since filters were added.' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foo_default', $manager->get_setting( 'foo' )->default, 'Expected static foo setting to not get overridden by dynamic setting.' );

-               $this->assertEquals( 'dynamic_bar_default', $manager->get_setting( 'bar' )->default, 'Expected dynamic setting bar to have default providd by filter.' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foo_default', $manager->get_setting( 'foo' )->default, 'Expected static foo setting to not get overridden by dynamic setting.' );

+               $this->assertSame( 'dynamic_bar_default', $manager->get_setting( 'bar' )->default, 'Expected dynamic setting bar to have default providd by filter.' );

</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">@@ -2925,7 +2925,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 filter_customize_dynamic_setting_class_for_test_dynamic_settings( $setting_class, $setting_id, $setting_args ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'WP_Customize_Setting', $setting_class );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'WP_Customize_Setting', $setting_class );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'string', $setting_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $setting_args );

</span><span class="cx" style="display: block; padding: 0 10px">                return $setting_class;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2948,12 +2948,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @see WP_Customize_Manager::set_preview_url()

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_preview_url() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( home_url( '/' ), $this->manager->get_preview_url() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( home_url( '/' ), $this->manager->get_preview_url() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $preview_url = home_url( '/foo/bar/baz/' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_preview_url( $preview_url );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $preview_url, $this->manager->get_preview_url() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $preview_url, $this->manager->get_preview_url() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->manager->set_preview_url( 'http://illegalsite.example.com/food/' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( home_url( '/' ), $this->manager->get_preview_url() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( home_url( '/' ), $this->manager->get_preview_url() );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2964,34 +2964,34 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_return_url() {

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::factory()->user->create( array( 'role' => 'author' ) ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( home_url( '/' ), $this->manager->get_return_url() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( home_url( '/' ), $this->manager->get_return_url() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::$admin_user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( current_user_can( 'edit_theme_options' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( home_url( '/' ), $this->manager->get_return_url() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( home_url( '/' ), $this->manager->get_return_url() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $preview_url = home_url( '/foo/' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_preview_url( $preview_url );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $preview_url, $this->manager->get_return_url() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $preview_url, $this->manager->get_return_url() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTP_REFERER'] = wp_slash( admin_url( 'customize.php' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $preview_url, $this->manager->get_return_url() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $preview_url, $this->manager->get_return_url() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // See #35355.

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTP_REFERER'] = wp_slash( admin_url( 'wp-login.php' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $preview_url, $this->manager->get_return_url() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $preview_url, $this->manager->get_return_url() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $url                     = home_url( '/referred/' );

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTP_REFERER'] = wp_slash( $url );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $url, $this->manager->get_return_url() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $url, $this->manager->get_return_url() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $url                     = 'http://badreferer.example.com/';

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTP_REFERER'] = wp_slash( $url );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $url, $this->manager->get_return_url() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $preview_url, $this->manager->get_return_url() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $preview_url, $this->manager->get_return_url() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_return_url( admin_url( 'edit.php?trashed=1' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( admin_url( 'edit.php' ), $this->manager->get_return_url() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( admin_url( 'edit.php' ), $this->manager->get_return_url() );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2999,7 +2999,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_return_url_with_deactivated_theme() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_return_url( admin_url( 'themes.php?page=mytheme_documentation' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( admin_url( 'themes.php' ), $this->manager->get_return_url() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( admin_url( 'themes.php' ), $this->manager->get_return_url() );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3016,15 +3016,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $autofocus = array( 'control' => 'blogname' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_autofocus( $autofocus );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $autofocus, $this->manager->get_autofocus() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $autofocus, $this->manager->get_autofocus() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $autofocus = array( 'section' => 'colors' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_autofocus( $autofocus );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $autofocus, $this->manager->get_autofocus() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $autofocus, $this->manager->get_autofocus() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $autofocus = array( 'panel' => 'widgets' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_autofocus( $autofocus );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $autofocus, $this->manager->get_autofocus() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $autofocus, $this->manager->get_autofocus() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $autofocus = array( 'control' => array( 'blogname', 'blogdescription' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_autofocus( $autofocus );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3045,7 +3045,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'customize_refresh_nonces', array( $this, 'filter_customize_refresh_nonces' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $nonces = $this->manager->get_nonces();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'foo', $nonces );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( wp_create_nonce( 'foo' ), $nonces['foo'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( wp_create_nonce( 'foo' ), $nonces['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">@@ -3090,7 +3090,7 @@

</span><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->assertEqualSets( array( 'theme', 'url', 'browser', 'panels', 'sections', 'nonce', 'autofocus', 'documentTitleTmpl', 'previewableDevices', 'changeset', 'timeouts', 'dateFormat', 'timeFormat', 'initialClientTimestamp', 'initialServerDate', 'initialServerTimestamp', 'l10n' ), array_keys( $data ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $autofocus, $data['autofocus'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $autofocus, $data['autofocus'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'save', $data['nonce'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'preview', $data['nonce'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3148,7 +3148,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->customize_preview_settings();

</span><span class="cx" style="display: block; padding: 0 10px">                $content = ob_get_clean();

</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->assertEquals( 1, preg_match( '/var _wpCustomizeSettings = ({.+});/', $content, $matches ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, preg_match( '/var _wpCustomizeSettings = ({.+});/', $content, $matches ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $settings = json_decode( $matches[1], true );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'theme', $settings );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3265,7 +3265,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $manager->prepare_controls();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $sorted_control_ids = wp_list_pluck( $manager->get_section( $section_id )->controls, 'id' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $added_control_ids, $sorted_control_ids );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $added_control_ids, $sorted_control_ids );

</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">@@ -3285,7 +3285,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->assertInstanceOf( 'WP_Customize_Section', $result_section );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $section_id, $result_section->id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $section_id, $result_section->id );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $section        = new WP_Customize_Section(

</span><span class="cx" style="display: block; padding: 0 10px">                        $manager,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3298,8 +3298,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result_section = $manager->add_section( $section );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Customize_Section', $result_section );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $section_id, $result_section->id );

-               $this->assertEquals( $section, $result_section );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $section_id, $result_section->id );

+               $this->assertSame( $section, $result_section );

</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">@@ -3313,14 +3313,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result_setting = $manager->add_setting( $setting_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Customize_Setting', $result_setting );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $setting_id, $result_setting->id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $setting_id, $result_setting->id );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $setting        = new WP_Customize_Setting( $manager, $setting_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $result_setting = $manager->add_setting( $setting );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Customize_Setting', $result_setting );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $setting, $result_setting );

-               $this->assertEquals( $setting_id, $result_setting->id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $setting, $result_setting );

+               $this->assertSame( $setting_id, $result_setting->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">@@ -3331,7 +3331,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $setting_id = 'dynamic';

</span><span class="cx" style="display: block; padding: 0 10px">                $setting    = $manager->add_setting( $setting_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'WP_Customize_Setting', get_class( $setting ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'WP_Customize_Setting', get_class( $setting ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertObjectNotHasAttribute( 'custom', $setting );

</span><span class="cx" style="display: block; padding: 0 10px">                $manager->remove_setting( $setting_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3338,9 +3338,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'customize_dynamic_setting_class', array( $this, 'return_dynamic_customize_setting_class' ), 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'customize_dynamic_setting_args', array( $this, 'return_dynamic_customize_setting_args' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = $manager->add_setting( $setting_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Test_Dynamic_Customize_Setting', get_class( $setting ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Test_Dynamic_Customize_Setting', get_class( $setting ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertObjectHasAttribute( 'custom', $setting );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foo', $setting->custom );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foo', $setting->custom );

</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">@@ -3390,7 +3390,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->assertInstanceOf( 'WP_Customize_Panel', $result_panel );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $panel_id, $result_panel->id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $panel_id, $result_panel->id );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $panel        = new WP_Customize_Panel(

</span><span class="cx" style="display: block; padding: 0 10px">                        $manager,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3402,8 +3402,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result_panel = $manager->add_panel( $panel );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Customize_Panel', $result_panel );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $panel, $result_panel );

-               $this->assertEquals( $panel_id, $result_panel->id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $panel, $result_panel );

+               $this->assertSame( $panel_id, $result_panel->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">@@ -3433,7 +3433,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->assertInstanceOf( 'WP_Customize_Control', $result_control );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $control_id, $result_control->id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $control_id, $result_control->id );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $control        = new WP_Customize_Control(

</span><span class="cx" style="display: block; padding: 0 10px">                        $manager,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3447,8 +3447,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $result_control = $manager->add_control( $control );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Customize_Control', $result_control );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $control, $result_control );

-               $this->assertEquals( $control_id, $result_control->id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $control, $result_control );

+               $this->assertSame( $control_id, $result_control->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">@@ -3544,7 +3544,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->prepare_controls();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->manager->controls();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $controls_sorted, array_keys( $result ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $controls_sorted, array_keys( $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">@@ -3573,7 +3573,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->prepare_controls();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->manager->sections();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $sections_sorted, array_keys( $result ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $sections_sorted, array_keys( $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">@@ -3602,7 +3602,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->prepare_controls();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $result = $this->manager->panels();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $panels_sorted, array_keys( $result ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $panels_sorted, array_keys( $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">@@ -3626,7 +3626,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $whitespaces as $whitespace ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $sanitized = $setting->sanitize( $whitespace . $video_url . $whitespace );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $video_url, $sanitized );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $video_url, $sanitized );

</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="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     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,8 +68,8 @@

</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">                $setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, 'nav_menu_item[123]' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'nav_menu_item', $setting->type );

-               $this->assertEquals( 123, $setting->post_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'nav_menu_item', $setting->type );

+               $this->assertSame( 123, $setting->post_id );

</ins><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><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">                        'nav_menu_term_id' => 0,

</span><span class="cx" style="display: block; padding: 0 10px">                        '_invalid'         => 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->assertEquals( $default, $setting->default );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $default, $setting->default );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $exception = null;

</span><span class="cx" style="display: block; padding: 0 10px">                try {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,9 +136,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'menu_item_parent' => 123,

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, 'nav_menu_item[-5]', compact( 'default' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( -5, $setting->post_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( -5, $setting->post_id );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNull( $setting->previous_post_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $default, $setting->default );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $default, $setting->default );

</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">@@ -167,17 +167,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post      = get_post( $item_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $menu_item = wp_setup_nav_menu_item( $post );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $item_title, $menu_item->title );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $item_title, $menu_item->title );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $setting_id = "nav_menu_item[$item_id]";

</span><span class="cx" style="display: block; padding: 0 10px">                $setting    = new WP_Customize_Nav_Menu_Item_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->assertEquals( $menu_item->title, $value['title'] );

-               $this->assertEquals( $menu_item->type, $value['type'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $menu_item->title, $value['title'] );

+               $this->assertSame( $menu_item->type, $value['type'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $menu_item->object_id, $value['object_id'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $menu_id, $value['nav_menu_term_id'] );

-               $this->assertEquals( 'Hello World', $value['original_title'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $menu_id, $value['nav_menu_term_id'] );

+               $this->assertSame( 'Hello World', $value['original_title'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $other_menu_id = wp_create_nav_menu( 'Menu2' );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_nav_menu_item(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,8 +188,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">                $value = $setting->value();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Hola', $value['title'] );

-               $this->assertEquals( $other_menu_id, $value['nav_menu_term_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Hola', $value['title'] );

+               $this->assertSame( $other_menu_id, $value['nav_menu_term_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">@@ -220,8 +220,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $setting    = new WP_Customize_Nav_Menu_Item_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->assertEquals( '', $value['title'] );

-               $this->assertEquals( $original_title, $value['original_title'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', $value['title'] );

+               $this->assertSame( $original_title, $value['original_title'] );

</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">@@ -250,17 +250,17 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post      = get_post( $item_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $menu_item = wp_setup_nav_menu_item( $post );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $item_title, $menu_item->title );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $item_title, $menu_item->title );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $setting_id = "nav_menu_item[$item_id]";

</span><span class="cx" style="display: block; padding: 0 10px">                $setting    = new WP_Customize_Nav_Menu_Item_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->assertEquals( $menu_item->title, $value['title'] );

-               $this->assertEquals( $menu_item->type, $value['type'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $menu_item->title, $value['title'] );

+               $this->assertSame( $menu_item->type, $value['type'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $menu_item->object_id, $value['object_id'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $menu_id, $value['nav_menu_term_id'] );

-               $this->assertEquals( 'Salutations', $value['original_title'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $menu_id, $value['nav_menu_term_id'] );

+               $this->assertSame( 'Salutations', $value['original_title'] );

</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">@@ -291,8 +291,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $setting    = new WP_Customize_Nav_Menu_Item_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->assertEquals( $menu_item->type_label, 'Custom Label' );

-               $this->assertEquals( $menu_item->type_label, $value['type_label'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $menu_item->type_label, 'Custom Label' );

+               $this->assertSame( $menu_item->type_label, $value['type_label'] );

</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">@@ -316,7 +316,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->wp_customize->set_post_value( $menu->id, $post_value );

</span><span class="cx" style="display: block; padding: 0 10px">                $menu->preview();

</span><span class="cx" style="display: block; padding: 0 10px">                $value = $menu->value();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $post_value, $value );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $post_value, $value );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $item_id = wp_update_nav_menu_item(

</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">                $setting_id = "nav_menu_item[$item_id]";

</span><span class="cx" style="display: block; padding: 0 10px">                $setting    = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, $setting_id );

</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->assertEquals( 0, $value['nav_menu_term_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, $value['nav_menu_term_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">@@ -391,7 +391,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $post_value['post_status'] = $post_value['status'];

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $post_value['status'] );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $post_value as $key => $value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value, $updated_item->$key, "Key $key mismatch" );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $value, $updated_item->$key, "Key $key mismatch" );

</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">@@ -444,13 +444,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( count( $current_items ), count( $preview_items ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $last_item = array_pop( $preview_items );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $new_item_id, $last_item->db_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $new_item_id, $last_item->db_id );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_value['post_status'] = $post_value['status'];

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $post_value['status'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_value['menu_order'] = $post_value['position'];

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $post_value['position'] );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $post_value as $key => $value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value, $last_item->$key, "Mismatch for $key property." );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $value, $last_item->$key, "Mismatch for $key property." );

</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">@@ -532,7 +532,7 @@

</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><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInternalType( 'array', $url_setting );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $valid_url, $url_setting['url'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $valid_url, $url_setting['url'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $invalid_urls = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,7 +543,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $invalid_urls as $invalid_url ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $url_setting = $setting->sanitize( array( 'url' => $invalid_url ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInstanceOf( 'WP_Error', $url_setting );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 'invalid_url', $url_setting->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'invalid_url', $url_setting->get_error_code() );

</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">                $unsanitized = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,7 +587,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( array_keys( $unsanitized ), array_keys( $sanitized ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $expected_sanitized as $key => $value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value, $sanitized[ $key ], "Expected $key to be sanitized." );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $value, $sanitized[ $key ], "Expected $key to be sanitized." );

</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">                $nav_menu_item_id = wp_update_nav_menu_item(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -616,18 +616,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_item = wp_setup_nav_menu_item( clone $post );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $expected_sanitized['object_id'], $nav_menu_item->object_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_sanitized['object'], $nav_menu_item->object );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_sanitized['object'], $nav_menu_item->object );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $expected_sanitized['menu_item_parent'], $nav_menu_item->menu_item_parent );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_sanitized['position'], $post->menu_order );

-               $this->assertEquals( $expected_sanitized['type'], $nav_menu_item->type );

-               $this->assertEquals( $expected_sanitized['title'], $post->post_title );

-               $this->assertEquals( $expected_sanitized['url'], $nav_menu_item->url );

-               $this->assertEquals( $expected_sanitized['description'], $post->post_content );

-               $this->assertEquals( $expected_sanitized['attr_title'], $post->post_excerpt );

-               $this->assertEquals( $expected_sanitized['target'], $nav_menu_item->target );

-               $this->assertEquals( $expected_sanitized['classes'], implode( ' ', $nav_menu_item->classes ) );

-               $this->assertEquals( $expected_sanitized['xfn'], $nav_menu_item->xfn );

-               $this->assertEquals( $expected_sanitized['status'], $post->post_status );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_sanitized['position'], $post->menu_order );

+               $this->assertSame( $expected_sanitized['type'], $nav_menu_item->type );

+               $this->assertSame( $expected_sanitized['title'], $post->post_title );

+               $this->assertSame( $expected_sanitized['url'], $nav_menu_item->url );

+               $this->assertSame( $expected_sanitized['description'], $post->post_content );

+               $this->assertSame( $expected_sanitized['attr_title'], $post->post_excerpt );

+               $this->assertSame( $expected_sanitized['target'], $nav_menu_item->target );

+               $this->assertSame( $expected_sanitized['classes'], implode( ' ', $nav_menu_item->classes ) );

+               $this->assertSame( $expected_sanitized['xfn'], $nav_menu_item->xfn );

+               $this->assertSame( $expected_sanitized['status'], $post->post_status );

</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">@@ -693,10 +693,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'error', $update_result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'status', $update_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->assertEquals( $item_id, $update_result['post_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $item_id, $update_result['post_id'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNull( $update_result['previous_post_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $update_result['error'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'updated', $update_result['status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'updated', $update_result['status'] );

</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">@@ -748,7 +748,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( count( $current_items ), count( $preview_items ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $last_item = array_pop( $preview_items );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $setting->post_id, $last_item->db_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $setting->post_id, $last_item->db_id );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_value['post_status'] = $post_value['status'];

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $post_value['status'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_value['menu_order'] = $post_value['position'];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -766,10 +766,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'error', $update_result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'status', $update_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->assertEquals( $setting->post_id, $update_result['post_id'] );

-               $this->assertEquals( $new_item_id, $update_result['previous_post_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $setting->post_id, $update_result['post_id'] );

+               $this->assertSame( $new_item_id, $update_result['previous_post_id'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNull( $update_result['error'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'inserted', $update_result['status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'inserted', $update_result['status'] );

</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">@@ -820,10 +820,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'error', $update_result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'status', $update_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->assertEquals( $delete_item_id, $update_result['post_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $delete_item_id, $update_result['post_id'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNull( $update_result['previous_post_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $update_result['error'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'deleted', $update_result['status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'deleted', $update_result['status'] );

</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">@@ -918,26 +918,26 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $item_value = $setting->value();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'type_label', $item_value );

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_item = $setting->value_as_wp_post_nav_menu_item();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Custom Link', $nav_menu_item->type_label );

-               $this->assertEquals( $item_value['type_label'], $nav_menu_item->type_label );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Custom Link', $nav_menu_item->type_label );

+               $this->assertSame( $item_value['type_label'], $nav_menu_item->type_label );

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'wp_setup_nav_menu_item', array( $this, 'filter_type_label' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_item = $setting->value_as_wp_post_nav_menu_item();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Custom Label', $nav_menu_item->type_label );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Custom Label', $nav_menu_item->type_label );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertObjectNotHasAttribute( 'nav_menu_term_id', $nav_menu_item );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertObjectNotHasAttribute( 'status', $nav_menu_item );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'publish', $nav_menu_item->post_status );

-               $this->assertEquals( 'nav_menu_item', $nav_menu_item->post_type );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'publish', $nav_menu_item->post_status );

+               $this->assertSame( 'nav_menu_item', $nav_menu_item->post_type );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertObjectNotHasAttribute( 'position', $nav_menu_item );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $post_value['position'], $nav_menu_item->menu_order );

-               $this->assertEquals( $post_value['title'], $nav_menu_item->post_title );

-               $this->assertEquals( 123, $nav_menu_item->ID );

-               $this->assertEquals( 123, $nav_menu_item->db_id );

-               $this->assertEquals( wp_get_current_user()->ID, $nav_menu_item->post_author );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $post_value['position'], $nav_menu_item->menu_order );

+               $this->assertSame( $post_value['title'], $nav_menu_item->post_title );

+               $this->assertSame( 123, $nav_menu_item->ID );

+               $this->assertSame( 123, $nav_menu_item->db_id );

+               $this->assertSame( wp_get_current_user()->ID, $nav_menu_item->post_author );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertObjectHasAttribute( 'type_label', $nav_menu_item );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = apply_filters( 'nav_menu_attr_title', wp_unslash( apply_filters( 'excerpt_save_pre', wp_slash( $post_value['attr_title'] ) ) ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $nav_menu_item->attr_title );

-               $this->assertEquals( 'Attempted \o/ o&#8217;o markup', $nav_menu_item->description );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $nav_menu_item->attr_title );

+               $this->assertSame( 'Attempted \o/ o&#8217;o markup', $nav_menu_item->description );

</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">@@ -973,7 +973,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->preview();

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_item = $setting->value_as_wp_post_nav_menu_item();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_term_link( $term_id ), $nav_menu_item->url );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_term_link( $term_id ), $nav_menu_item->url );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Post.

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Nav_Menu_Item_Setting(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -992,7 +992,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->preview();

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_item = $setting->value_as_wp_post_nav_menu_item();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_permalink( $post_id ), $nav_menu_item->url );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_permalink( $post_id ), $nav_menu_item->url );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Post type archive.

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Nav_Menu_Item_Setting(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1010,7 +1010,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->preview();

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_item = $setting->value_as_wp_post_nav_menu_item();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_post_type_archive_link( 'press_release' ), $nav_menu_item->url );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_post_type_archive_link( 'press_release' ), $nav_menu_item->url );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1064,15 +1064,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'nav_menu_item[' . $nav_menu_item_id . ']'

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $item_value       = $setting->value();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $original_post_title, $item_value['original_title'] );

-               $this->assertEquals( '', $item_value['title'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $original_post_title, $item_value['original_title'] );

+               $this->assertSame( '', $item_value['title'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $item = $setting->value_as_wp_post_nav_menu_item();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertObjectHasAttribute( 'type_label', $item );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $original_post_title, $item->original_title );

-               $this->assertEquals( $original_post_title, $item->title );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $original_post_title, $item->original_title );

+               $this->assertSame( $original_post_title, $item->title );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'type_label', $item_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_post_type_object( 'press_release' )->labels->singular_name, $item_value['type_label'] );

-               $this->assertEquals( $item->type_label, $item_value['type_label'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_post_type_object( 'press_release' )->labels->singular_name, $item_value['type_label'] );

+               $this->assertSame( $item->type_label, $item_value['type_label'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Post: staged nav menu item.

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Nav_Menu_Item_Setting(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1091,15 +1091,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->preview();

</span><span class="cx" style="display: block; padding: 0 10px">                $item_value = $setting->value();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $original_post_title, $item_value['original_title'] );

-               $this->assertEquals( '', $item_value['title'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $original_post_title, $item_value['original_title'] );

+               $this->assertSame( '', $item_value['title'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $item = $setting->value_as_wp_post_nav_menu_item();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertObjectHasAttribute( 'type_label', $item );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $original_post_title, $item->original_title );

-               $this->assertEquals( $original_post_title, $item->title );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $original_post_title, $item->original_title );

+               $this->assertSame( $original_post_title, $item->title );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'type_label', $item_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_post_type_object( 'press_release' )->labels->singular_name, $item_value['type_label'] );

-               $this->assertEquals( $item->type_label, $item_value['type_label'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_post_type_object( 'press_release' )->labels->singular_name, $item_value['type_label'] );

+               $this->assertSame( $item->type_label, $item_value['type_label'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Term: existing nav menu item.

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_item_id = wp_update_nav_menu_item(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1118,15 +1118,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'nav_menu_item[' . $nav_menu_item_id . ']'

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $item_value       = $setting->value();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $original_term_title, $item_value['original_title'] );

-               $this->assertEquals( '', $item_value['title'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $original_term_title, $item_value['original_title'] );

+               $this->assertSame( '', $item_value['title'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $item = $setting->value_as_wp_post_nav_menu_item();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertObjectHasAttribute( 'type_label', $item );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $original_term_title, $item->original_title );

-               $this->assertEquals( $original_term_title, $item->title );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $original_term_title, $item->original_title );

+               $this->assertSame( $original_term_title, $item->title );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'type_label', $item_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_taxonomy( 'category' )->labels->singular_name, $item_value['type_label'] );

-               $this->assertEquals( $item->type_label, $item_value['type_label'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_taxonomy( 'category' )->labels->singular_name, $item_value['type_label'] );

+               $this->assertSame( $item->type_label, $item_value['type_label'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Term: staged nav menu item.

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Nav_Menu_Item_Setting(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1145,15 +1145,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->preview();

</span><span class="cx" style="display: block; padding: 0 10px">                $item_value = $setting->value();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $original_term_title, $item_value['original_title'] );

-               $this->assertEquals( '', $item_value['title'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $original_term_title, $item_value['original_title'] );

+               $this->assertSame( '', $item_value['title'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $item = $setting->value_as_wp_post_nav_menu_item();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertObjectHasAttribute( 'type_label', $item );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $original_term_title, $item->original_title );

-               $this->assertEquals( $original_term_title, $item->title );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $original_term_title, $item->original_title );

+               $this->assertSame( $original_term_title, $item->title );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'type_label', $item_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_taxonomy( 'category' )->labels->singular_name, $item_value['type_label'] );

-               $this->assertEquals( $item->type_label, $item_value['type_label'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_taxonomy( 'category' )->labels->singular_name, $item_value['type_label'] );

+               $this->assertSame( $item->type_label, $item_value['type_label'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Post Type Archive: existing nav menu item.

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_item_id = wp_update_nav_menu_item(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1171,15 +1171,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'nav_menu_item[' . $nav_menu_item_id . ']'

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $item_value       = $setting->value();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_post_type_object( 'press_release' )->labels->archives, $item_value['original_title'] );

-               $this->assertEquals( '', $item_value['title'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item_value['original_title'] );

+               $this->assertSame( '', $item_value['title'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $item = $setting->value_as_wp_post_nav_menu_item();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertObjectHasAttribute( 'type_label', $item );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_post_type_object( 'press_release' )->labels->archives, $item->original_title );

-               $this->assertEquals( get_post_type_object( 'press_release' )->labels->archives, $item->title );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item->original_title );

+               $this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item->title );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'type_label', $item_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( __( 'Post Type Archive' ), $item_value['type_label'] );

-               $this->assertEquals( $item->type_label, $item_value['type_label'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( __( 'Post Type Archive' ), $item_value['type_label'] );

+               $this->assertSame( $item->type_label, $item_value['type_label'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Post Type Archive: staged nav menu item.

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Nav_Menu_Item_Setting(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1197,15 +1197,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->preview();

</span><span class="cx" style="display: block; padding: 0 10px">                $item_value = $setting->value();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_post_type_object( 'press_release' )->labels->archives, $item_value['original_title'] );

-               $this->assertEquals( '', $item_value['title'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item_value['original_title'] );

+               $this->assertSame( '', $item_value['title'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $item = $setting->value_as_wp_post_nav_menu_item();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertObjectHasAttribute( 'type_label', $item );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_post_type_object( 'press_release' )->labels->archives, $item->original_title );

-               $this->assertEquals( get_post_type_object( 'press_release' )->labels->archives, $item->title );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item->original_title );

+               $this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item->title );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'type_label', $item_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( __( 'Post Type Archive' ), $item_value['type_label'] );

-               $this->assertEquals( $item->type_label, $item_value['type_label'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( __( 'Post Type Archive' ), $item_value['type_label'] );

+               $this->assertSame( $item->type_label, $item_value['type_label'] );

</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">@@ -1238,6 +1238,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->preview();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_item = $setting->value_as_wp_post_nav_menu_item();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $original_title, $nav_menu_item->title );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $original_title, $nav_menu_item->title );

</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="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  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/customize/nav-menu-setting.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,9 +64,9 @@

</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">                $setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, 'nav_menu[123]' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'nav_menu', $setting->type );

-               $this->assertEquals( 'postMessage', $setting->transport );

-               $this->assertEquals( 123, $setting->term_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'nav_menu', $setting->type );

+               $this->assertSame( 'postMessage', $setting->transport );

+               $this->assertSame( 123, $setting->term_id );

</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,9 +74,9 @@

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', $setting->default['name'] );

-               $this->assertEquals( '', $setting->default['description'] );

-               $this->assertEquals( 0, $setting->default['parent'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', $setting->default['name'] );

+               $this->assertSame( '', $setting->default['description'] );

+               $this->assertSame( 0, $setting->default['parent'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $exception = null;

</span><span class="cx" style="display: block; padding: 0 10px">                try {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,8 +119,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'parent'      => 123,

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, 'nav_menu[-5]', compact( 'default' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( -5, $setting->term_id );

-               $this->assertEquals( $default, $setting->default );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( -5, $setting->term_id );

+               $this->assertSame( $default, $setting->default );

</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">@@ -153,14 +153,14 @@

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $menu_name, $value['name'] );

-               $this->assertEquals( $description, $value['description'] );

-               $this->assertEquals( $parent_menu_id, $value['parent'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $menu_name, $value['name'] );

+               $this->assertSame( $description, $value['description'] );

+               $this->assertSame( $parent_menu_id, $value['parent'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $new_menu_name = 'Foo';

</span><span class="cx" style="display: block; padding: 0 10px">                wp_update_nav_menu_object( $menu_id, wp_slash( array( 'menu-name' => $new_menu_name ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $updated_value = $setting->value();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $new_menu_name, $updated_value['name'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $new_menu_name, $updated_value['name'] );

</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">@@ -196,9 +196,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->wp_customize->set_post_value( $setting_id, $post_value );

</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->assertEquals( 'Name 1 \\o/', $value['name'] );

-               $this->assertEquals( 'Description 1 \\o/', $value['description'] );

-               $this->assertEquals( 0, $value['parent'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Name 1 \\o/', $value['name'] );

+               $this->assertSame( 'Description 1 \\o/', $value['description'] );

+               $this->assertSame( 0, $value['parent'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $term = (array) wp_get_nav_menu_object( $menu_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,15 +209,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->preview();

</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->assertEquals( 'Name 2 \\o/', $value['name'] );

-               $this->assertEquals( 'Description 2 \\o/', $value['description'] );

-               $this->assertEquals( 1, $value['parent'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Name 2 \\o/', $value['name'] );

+               $this->assertSame( 'Description 2 \\o/', $value['description'] );

+               $this->assertSame( 1, $value['parent'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $term = (array) wp_get_nav_menu_object( $menu_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( $value, wp_array_slice_assoc( $term, array_keys( $value ) ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $menu_object = wp_get_nav_menu_object( $menu_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( (object) $term, $menu_object );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $post_value['name'], $menu_object->name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $post_value['name'], $menu_object->name );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_options = get_option( 'nav_menu_options', array( 'auto_add' => array() ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( $menu_id, $nav_menu_options['auto_add'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,7 +227,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $i         = array_search( $menu_id, $menus_ids, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'int', $i, 'Update-previewed menu does not appear in wp_get_nav_menus()' );

</span><span class="cx" style="display: block; padding: 0 10px">                $filtered_menu = $menus[ $i ];

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Name 2 \\o/', $filtered_menu->name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Name 2 \\o/', $filtered_menu->name );

</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">@@ -251,18 +251,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->wp_customize->set_post_value( $setting->id, $post_value );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->preview();

</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->assertEquals( $post_value, $value );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $post_value, $value );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $term = (array) wp_get_nav_menu_object( $menu_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $term );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $term );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets( $post_value, wp_array_slice_assoc( $term, array_keys( $value ) ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $menu_id, $term['term_id'] );

-               $this->assertEquals( $menu_id, $term['term_taxonomy_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $menu_id, $term['term_id'] );

+               $this->assertSame( $menu_id, $term['term_taxonomy_id'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $menu_object = wp_get_nav_menu_object( $menu_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( (object) $term, $menu_object );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $post_value['name'], $menu_object->name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $post_value['name'], $menu_object->name );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_options = $this->get_nav_menu_items_option();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( $menu_id, $nav_menu_options['auto_add'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $i         = array_search( $menu_id, $menus_ids, true );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'int', $i, 'Insert-previewed menu was not injected into wp_get_nav_menus()' );

</span><span class="cx" style="display: block; padding: 0 10px">                $filtered_menu = $menus[ $i ];

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'New Menu Name 1 \\o/', $filtered_menu->name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'New Menu Name 1 \\o/', $filtered_menu->name );

</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">@@ -334,15 +334,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'extra'       => 'ignored',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $sanitized = $setting->sanitize( $value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Hello \\o/ &lt;b&gt;world&lt;/b&gt;', $sanitized['name'] );

-               $this->assertEquals( 'New line \\o/', $sanitized['description'] );

-               $this->assertEquals( 0, $sanitized['parent'] );

-               $this->assertEquals( true, $sanitized['auto_add'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Hello \\o/ &lt;b&gt;world&lt;/b&gt;', $sanitized['name'] );

+               $this->assertSame( 'New line \\o/', $sanitized['description'] );

+               $this->assertSame( 0, $sanitized['parent'] );

+               $this->assertTrue( $sanitized['auto_add'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEqualSets( array( 'name', 'description', 'parent', 'auto_add' ), array_keys( $sanitized ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $value['name'] = '    '; // Blank spaces.

</span><span class="cx" style="display: block; padding: 0 10px">                $sanitized     = $setting->sanitize( $value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '(unnamed)', $sanitized['name'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '(unnamed)', $sanitized['name'] );

</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">@@ -383,13 +383,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $menu_object = wp_get_nav_menu_object( $menu_id );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( array( 'name', 'description', 'parent' ) as $key ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $new_value[ $key ], $menu_object->$key );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $new_value[ $key ], $menu_object->$key );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEqualSets(

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_array_slice_assoc( $new_value, array( 'name', 'description', 'parent' ) ),

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_array_slice_assoc( (array) $menu_object, array( 'name', 'description', 'parent' ) )

</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->assertEquals( $new_value, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $new_value, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $save_response = apply_filters( 'customize_save_response', array() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'nav_menu_updates', $save_response );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,12 +399,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'error', $update_result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'status', $update_result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'saved_value', $update_result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $new_value, $update_result['saved_value'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $new_value, $update_result['saved_value'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $menu_id, $update_result['term_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $menu_id, $update_result['term_id'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNull( $update_result['previous_term_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $update_result['error'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'updated', $update_result['status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'updated', $update_result['status'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_options = $this->get_nav_menu_items_option();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( $menu_id, $nav_menu_options['auto_add'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -433,7 +433,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->assertLessThan( 0, $setting->term_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->save();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $menu_id, $setting->previous_term_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $menu_id, $setting->previous_term_id );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertGreaterThan( 0, $setting->term_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_options = $this->get_nav_menu_items_option();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,12 +451,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'error', $update_result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'status', $update_result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'saved_value', $update_result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $setting->value(), $update_result['saved_value'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $setting->value(), $update_result['saved_value'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $menu->term_id, $update_result['term_id'] );

-               $this->assertEquals( $menu_id, $update_result['previous_term_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $menu->term_id, $update_result['term_id'] );

+               $this->assertSame( $menu_id, $update_result['previous_term_id'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNull( $update_result['error'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'inserted', $update_result['status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'inserted', $update_result['status'] );

</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">@@ -478,10 +478,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected_resolved_menu_name = "$menu_name (2)";

</span><span class="cx" style="display: block; padding: 0 10px">                $new_menu                    = wp_get_nav_menu_object( $setting->term_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_resolved_menu_name, $new_menu->name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_resolved_menu_name, $new_menu->name );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $save_response = apply_filters( 'customize_save_response', array() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_resolved_menu_name, $save_response['nav_menu_updates'][0]['saved_value']['name'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_resolved_menu_name, $save_response['nav_menu_updates'][0]['saved_value']['name'] );

</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">@@ -501,7 +501,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'nav_menu_options', $nav_menu_options );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $menu = wp_get_nav_menu_object( $menu_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $menu_name, $menu->name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $menu_name, $menu->name );

</ins><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">                $setting->save();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -518,10 +518,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'saved_value', $update_result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $update_result['saved_value'] );

</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->assertEquals( $menu_id, $update_result['term_id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $menu_id, $update_result['term_id'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNull( $update_result['previous_term_id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $update_result['error'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'deleted', $update_result['status'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'deleted', $update_result['status'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_options = $this->get_nav_menu_items_option();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( $menu_id, $nav_menu_options['auto_add'] );

</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 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/customize/nav-menus.php   2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,9 +46,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function filter_item_types( $items ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $items[] = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'title'      => 'Custom',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        'type_label' => 'Custom Type',

</ins><span class="cx" style="display: block; padding: 0 10px">                         'type'       => 'custom_type',

</span><span class="cx" style="display: block; padding: 0 10px">                        'object'     => 'custom_object',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'type_label' => 'Custom Type',

</del><span class="cx" style="display: block; padding: 0 10px">                 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                return $items;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,20 +86,20 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $menus = new WP_Customize_Nav_Menus( $this->wp_customize );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Customize_Manager', $menus->manager );

</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->assertEquals( 10, add_filter( 'customize_refresh_nonces', array( $menus, 'filter_nonces' ) ) );

-               $this->assertEquals( 10, add_action( 'wp_ajax_load-available-menu-items-customizer', array( $menus, 'ajax_load_available_items' ) ) );

-               $this->assertEquals( 10, add_action( 'wp_ajax_search-available-menu-items-customizer', array( $menus, 'ajax_search_available_items' ) ) );

-               $this->assertEquals( 10, add_action( 'wp_ajax_customize-nav-menus-insert-auto-draft', array( $menus, 'ajax_insert_auto_draft_post' ) ) );

-               $this->assertEquals( 10, add_action( 'customize_controls_enqueue_scripts', array( $menus, 'enqueue_scripts' ) ) );

-               $this->assertEquals( 11, add_action( 'customize_register', array( $menus, 'customize_register' ) ) );

-               $this->assertEquals( 10, add_filter( 'customize_dynamic_setting_args', array( $menus, 'filter_dynamic_setting_args' ) ) );

-               $this->assertEquals( 10, add_filter( 'customize_dynamic_setting_class', array( $menus, 'filter_dynamic_setting_class' ) ) );

-               $this->assertEquals( 10, add_action( 'customize_controls_print_footer_scripts', array( $menus, 'print_templates' ) ) );

-               $this->assertEquals( 10, add_action( 'customize_controls_print_footer_scripts', array( $menus, 'available_items_template' ) ) );

-               $this->assertEquals( 10, add_action( 'customize_preview_init', array( $menus, 'customize_preview_init' ) ) );

-               $this->assertEquals( 10, add_action( 'customize_preview_init', array( $menus, 'make_auto_draft_status_previewable' ) ) );

-               $this->assertEquals( 10, add_action( 'customize_save_nav_menus_created_posts', array( $menus, 'save_nav_menus_created_posts' ) ) );

-               $this->assertEquals( 10, add_filter( 'customize_dynamic_partial_args', array( $menus, 'customize_dynamic_partial_args' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertTrue( add_filter( 'customize_refresh_nonces', array( $menus, 'filter_nonces' ) ) );

+               $this->assertTrue( add_action( 'wp_ajax_load-available-menu-items-customizer', array( $menus, 'ajax_load_available_items' ) ) );

+               $this->assertTrue( add_action( 'wp_ajax_search-available-menu-items-customizer', array( $menus, 'ajax_search_available_items' ) ) );

+               $this->assertTrue( add_action( 'wp_ajax_customize-nav-menus-insert-auto-draft', array( $menus, 'ajax_insert_auto_draft_post' ) ) );

+               $this->assertTrue( add_action( 'customize_controls_enqueue_scripts', array( $menus, 'enqueue_scripts' ) ) );

+               $this->assertTrue( add_action( 'customize_register', array( $menus, 'customize_register' ) ) );

+               $this->assertTrue( add_filter( 'customize_dynamic_setting_args', array( $menus, 'filter_dynamic_setting_args' ) ) );

+               $this->assertTrue( add_filter( 'customize_dynamic_setting_class', array( $menus, 'filter_dynamic_setting_class' ) ) );

+               $this->assertTrue( add_action( 'customize_controls_print_footer_scripts', array( $menus, 'print_templates' ) ) );

+               $this->assertTrue( add_action( 'customize_controls_print_footer_scripts', array( $menus, 'available_items_template' ) ) );

+               $this->assertTrue( add_action( 'customize_preview_init', array( $menus, 'customize_preview_init' ) ) );

+               $this->assertTrue( add_action( 'customize_preview_init', array( $menus, 'make_auto_draft_status_previewable' ) ) );

+               $this->assertTrue( add_action( 'customize_save_nav_menus_created_posts', array( $menus, 'save_nav_menus_created_posts' ) ) );

+               $this->assertTrue( add_filter( 'customize_dynamic_partial_args', array( $menus, 'customize_dynamic_partial_args' ) ) );

</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">@@ -113,12 +113,12 @@

<span class="cx" style="display: block; padding: 0 10px">                // Invalid post type $obj_name.

</span><span class="cx" style="display: block; padding: 0 10px">                $items = $menus->load_available_items_query( 'post_type', 'invalid' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $items );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'nav_menus_invalid_post_type', $items->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'nav_menus_invalid_post_type', $items->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Invalid taxonomy $obj_name.

</span><span class="cx" style="display: block; padding: 0 10px">                $items = $menus->load_available_items_query( 'taxonomy', 'invalid' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $items );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'invalid_taxonomy', $items->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_taxonomy', $items->get_error_code() );

</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">@@ -317,7 +317,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                's'       => 'This Does NOT Exist',

</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->assertEquals( $expected, $results );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $results );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test posts.

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $post_ids as $post_id ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +339,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        's'       => $s,

</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->assertEquals( $expected, $results[0] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected, $results[0] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test terms.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -361,7 +361,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        's'       => $s,

</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->assertEquals( $expected, $results[0] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected, $results[0] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test filtered results.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,7 +380,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                's'       => 'cat',

</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->assertEquals( $count + 1, $this->filter_count_customize_nav_menu_searched_items );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $count + 1, $this->filter_count_customize_nav_menu_searched_items );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInternalType( 'array', $results );

</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,8 +394,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 1, $results );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'home', $results[0]['id'] );

-               $this->assertEquals( 'custom', $results[0]['type'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'home', $results[0]['id'] );

+               $this->assertSame( 'custom', $results[0]['type'] );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /*

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,11 +512,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = array( 'type' => 'nav_menu_item' );

</span><span class="cx" style="display: block; padding: 0 10px">                $results  = $menus->filter_dynamic_setting_args( $this->wp_customize, 'nav_menu_item[123]' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected['type'], $results['type'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected['type'], $results['type'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = array( 'type' => 'nav_menu' );

</span><span class="cx" style="display: block; padding: 0 10px">                $results  = $menus->filter_dynamic_setting_args( $this->wp_customize, 'nav_menu[123]' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected['type'], $results['type'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected['type'], $results['type'] );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,11 +530,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'WP_Customize_Nav_Menu_Item_Setting';

</span><span class="cx" style="display: block; padding: 0 10px">                $results  = $menus->filter_dynamic_setting_class( 'WP_Customize_Setting', 'nav_menu_item[123]', array( 'type' => 'nav_menu_item' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $results );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $results );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'WP_Customize_Nav_Menu_Setting';

</span><span class="cx" style="display: block; padding: 0 10px">                $results  = $menus->filter_dynamic_setting_class( 'WP_Customize_Setting', 'nav_menu[123]', array( 'type' => 'nav_menu' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $results );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $results );

</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">@@ -559,14 +559,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</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">                $this->assertInstanceOf( 'WP_Customize_Nav_Menu_Item_Setting', $this->wp_customize->get_setting( "nav_menu_item[$item_id]" ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Primary', $this->wp_customize->get_section( "nav_menu[$menu_id]" )->title );

-               $this->assertEquals( 'Hello World', $this->wp_customize->get_control( "nav_menu_item[$item_id]" )->label );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Primary', $this->wp_customize->get_section( "nav_menu[$menu_id]" )->title );

+               $this->assertSame( 'Hello World', $this->wp_customize->get_control( "nav_menu_item[$item_id]" )->label );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menus_created_posts_setting = $this->wp_customize->get_setting( 'nav_menus_created_posts' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Customize_Filter_Setting', $nav_menus_created_posts_setting );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'postMessage', $nav_menus_created_posts_setting->transport );

-               $this->assertEquals( array(), $nav_menus_created_posts_setting->default );

-               $this->assertEquals( array( $this->wp_customize->nav_menus, 'sanitize_nav_menus_created_posts' ), $nav_menus_created_posts_setting->sanitize_callback );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'postMessage', $nav_menus_created_posts_setting->transport );

+               $this->assertSame( array(), $nav_menus_created_posts_setting->default );

+               $this->assertSame( array( $this->wp_customize->nav_menus, 'sanitize_nav_menus_created_posts' ), $nav_menus_created_posts_setting->sanitize_callback );

</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">@@ -578,14 +578,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $menus = new WP_Customize_Nav_Menus( $this->wp_customize );

</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->assertEquals( 2, $menus->intval_base10( 2 ) );

-               $this->assertEquals( 4, $menus->intval_base10( 4.1 ) );

-               $this->assertEquals( 4, $menus->intval_base10( '4' ) );

-               $this->assertEquals( 4, $menus->intval_base10( '04' ) );

-               $this->assertEquals( 42, $menus->intval_base10( +42 ) );

-               $this->assertEquals( -42, $menus->intval_base10( -42 ) );

-               $this->assertEquals( 26, $menus->intval_base10( 0x1A ) );

-               $this->assertEquals( 0, $menus->intval_base10( array() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, $menus->intval_base10( 2 ) );

+               $this->assertSame( 4, $menus->intval_base10( 4.1 ) );

+               $this->assertSame( 4, $menus->intval_base10( '4' ) );

+               $this->assertSame( 4, $menus->intval_base10( '04' ) );

+               $this->assertSame( 42, $menus->intval_base10( +42 ) );

+               $this->assertSame( -42, $menus->intval_base10( -42 ) );

+               $this->assertSame( 26, $menus->intval_base10( 0x1A ) );

+               $this->assertSame( 0, $menus->intval_base10( array() ) );

</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">@@ -600,27 +600,27 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'title'      => 'Posts',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'type_label' => __( 'Post' ),

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'type'       => 'post_type',

</span><span class="cx" style="display: block; padding: 0 10px">                                'object'     => 'post',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'type_label' => __( 'Post' ),

</del><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'title'      => 'Pages',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'type_label' => __( 'Page' ),

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'type'       => 'post_type',

</span><span class="cx" style="display: block; padding: 0 10px">                                'object'     => 'page',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'type_label' => __( 'Page' ),

</del><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'title'      => 'Categories',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'type_label' => __( 'Category' ),

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'type'       => 'taxonomy',

</span><span class="cx" style="display: block; padding: 0 10px">                                'object'     => 'category',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'type_label' => __( 'Category' ),

</del><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'title'      => 'Tags',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'type_label' => __( 'Tag' ),

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'type'       => 'taxonomy',

</span><span class="cx" style="display: block; padding: 0 10px">                                'object'     => 'post_tag',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'type_label' => __( 'Tag' ),

</del><span class="cx" style="display: block; padding: 0 10px">                         ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -627,33 +627,33 @@

</span><span class="cx" style="display: block; padding: 0 10px">                if ( current_theme_supports( 'post-formats' ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $expected[] = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'title'      => 'Format',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'type_label' => __( 'Format' ),

</ins><span class="cx" style="display: block; padding: 0 10px">                                 'type'       => 'taxonomy',

</span><span class="cx" style="display: block; padding: 0 10px">                                'object'     => 'post_format',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'type_label' => __( 'Format' ),

</del><span class="cx" style="display: block; padding: 0 10px">                         );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $menus->available_item_types() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $menus->available_item_types() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                register_taxonomy( 'wptests_tax', array( 'post' ), array( 'labels' => array( 'name' => 'Foo' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected[] = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'title'      => 'Foo',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        'type_label' => 'Foo',

</ins><span class="cx" style="display: block; padding: 0 10px">                         'type'       => 'taxonomy',

</span><span class="cx" style="display: block; padding: 0 10px">                        'object'     => 'wptests_tax',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'type_label' => 'Foo',

</del><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->assertEquals( $expected, $menus->available_item_types() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $menus->available_item_types() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected[] = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'title'      => 'Custom',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        'type_label' => 'Custom Type',

</ins><span class="cx" style="display: block; padding: 0 10px">                         'type'       => 'custom_type',

</span><span class="cx" style="display: block; padding: 0 10px">                        'object'     => 'custom_object',

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'type_label' => 'Custom Type',

</del><span class="cx" style="display: block; padding: 0 10px">                 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'customize_nav_menu_available_item_types', array( $this, 'filter_item_types' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $menus->available_item_types() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $menus->available_item_types() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'customize_nav_menu_available_item_types', array( $this, 'filter_item_types' ) );

</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">@@ -668,7 +668,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $r = $menus->insert_auto_draft_post( array() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'unknown_post_type', $r->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'unknown_post_type', $r->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Non-existent post types allowed as of #39610.

</span><span class="cx" style="display: block; padding: 0 10px">                $r = $menus->insert_auto_draft_post(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -678,11 +678,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Post', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->wp_customize->changeset_uuid(), get_post_meta( $r->ID, '_customize_changeset_uuid', true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->wp_customize->changeset_uuid(), get_post_meta( $r->ID, '_customize_changeset_uuid', true ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $r = $menus->insert_auto_draft_post( array( 'post_type' => 'post' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Error', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'empty_title', $r->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'empty_title', $r->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $r = $menus->insert_auto_draft_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -692,7 +692,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->assertInstanceOf( 'WP_Error', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'status_forbidden', $r->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'status_forbidden', $r->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $r = $menus->insert_auto_draft_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -701,11 +701,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Post', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Hello World', $r->post_title );

-               $this->assertEquals( '', $r->post_name );

-               $this->assertEquals( 'hello-world', get_post_meta( $r->ID, '_customize_draft_post_name', true ) );

-               $this->assertEquals( $this->wp_customize->changeset_uuid(), get_post_meta( $r->ID, '_customize_changeset_uuid', true ) );

-               $this->assertEquals( 'post', $r->post_type );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Hello World', $r->post_title );

+               $this->assertSame( '', $r->post_name );

+               $this->assertSame( 'hello-world', get_post_meta( $r->ID, '_customize_draft_post_name', true ) );

+               $this->assertSame( $this->wp_customize->changeset_uuid(), get_post_meta( $r->ID, '_customize_changeset_uuid', true ) );

+               $this->assertSame( 'post', $r->post_type );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $r = $menus->insert_auto_draft_post(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,12 +716,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Post', $r );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Hello World', $r->post_title );

-               $this->assertEquals( 'post', $r->post_type );

-               $this->assertEquals( '', $r->post_name );

-               $this->assertEquals( 'greetings-world', get_post_meta( $r->ID, '_customize_draft_post_name', true ) );

-               $this->assertEquals( $this->wp_customize->changeset_uuid(), get_post_meta( $r->ID, '_customize_changeset_uuid', true ) );

-               $this->assertEquals( 'Hi World', $r->post_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Hello World', $r->post_title );

+               $this->assertSame( 'post', $r->post_type );

+               $this->assertSame( '', $r->post_name );

+               $this->assertSame( 'greetings-world', get_post_meta( $r->ID, '_customize_draft_post_name', true ) );

+               $this->assertSame( $this->wp_customize->changeset_uuid(), get_post_meta( $r->ID, '_customize_changeset_uuid', true ) );

+               $this->assertSame( 'Hi World', $r->post_content );

</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">@@ -805,14 +805,14 @@

</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><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'nav_menu_instance', $args['type'] );

-               $this->assertEquals( array( $this->wp_customize->nav_menus, 'render_nav_menu_partial' ), $args['render_callback'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'nav_menu_instance', $args['type'] );

+               $this->assertSame( array( $this->wp_customize->nav_menus, 'render_nav_menu_partial' ), $args['render_callback'] );

</ins><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><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'nav_menu_instance', $args['type'] );

-               $this->assertEquals( array( $this->wp_customize->nav_menus, 'render_nav_menu_partial' ), $args['render_callback'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'nav_menu_instance', $args['type'] );

+               $this->assertSame( array( $this->wp_customize->nav_menus, 'render_nav_menu_partial' ), $args['render_callback'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $args['container_inclusive'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $args['fallback_refresh'] );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -827,9 +827,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $menus = new WP_Customize_Nav_Menus( $this->wp_customize );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $menus->customize_preview_init();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 10, has_action( 'wp_enqueue_scripts', array( $menus, 'customize_preview_enqueue_deps' ) ) );

-               $this->assertEquals( 1000, has_filter( 'wp_nav_menu_args', array( $menus, 'filter_wp_nav_menu_args' ) ) );

-               $this->assertEquals( 10, has_filter( 'wp_nav_menu', array( $menus, 'filter_wp_nav_menu' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_action( 'wp_enqueue_scripts', array( $menus, 'customize_preview_enqueue_deps' ) ) );

+               $this->assertSame( 1000, has_filter( 'wp_nav_menu_args', array( $menus, 'filter_wp_nav_menu_args' ) ) );

+               $this->assertSame( 10, has_filter( 'wp_nav_menu', array( $menus, 'filter_wp_nav_menu' ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -907,15 +907,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( $contributor_user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $sanitized = $menus->sanitize_nav_menus_created_posts( $value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array(), $sanitized );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), $sanitized );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( $author_user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $sanitized = $menus->sanitize_nav_menus_created_posts( $value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $author_post_id ), $sanitized );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $author_post_id ), $sanitized );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( $administrator_user_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $sanitized = $menus->sanitize_nav_menus_created_posts( $value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $contributor_post_id, $author_post_id, $administrator_post_id, $draft_post_id ), $sanitized );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $contributor_post_id, $author_post_id, $administrator_post_id, $draft_post_id ), $sanitized );

</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">@@ -996,13 +996,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->wp_customize->set_post_value( $setting_id, array_merge( $post_ids, array( $pre_published_post_id ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = $this->wp_customize->get_setting( $setting_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Customize_Filter_Setting', $setting );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $menus, 'sanitize_nav_menus_created_posts' ), $setting->sanitize_callback );

-               $this->assertEquals( $drafted_post_ids, $setting->post_value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $menus, 'sanitize_nav_menus_created_posts' ), $setting->sanitize_callback );

+               $this->assertSame( $drafted_post_ids, $setting->post_value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayNotHasKey( $private_post_id, $post_ids );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayNotHasKey( $trashed_post_id, $post_ids );

</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->assertEquals( 'auto-draft', get_post_status( $drafted_post_ids[0] ) );

-               $this->assertEquals( 'draft', get_post_status( $drafted_post_ids[1] ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'auto-draft', get_post_status( $drafted_post_ids[0] ) );

+               $this->assertSame( 'draft', get_post_status( $drafted_post_ids[1] ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $drafted_post_ids as $post_id ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEmpty( get_post( $post_id )->post_name );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertNotEmpty( get_post_meta( $post_id, '_customize_draft_post_name', true ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1010,15 +1010,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $save_action_count = did_action( 'customize_save_nav_menus_created_posts' );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->save();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $save_action_count + 1, did_action( 'customize_save_nav_menus_created_posts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $save_action_count + 1, did_action( 'customize_save_nav_menus_created_posts' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $drafted_post_ids as $post_id ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 'publish', get_post_status( $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'publish', get_post_status( $post_id ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertRegExp( '/^auto-draft-\d+$/', get_post( $post_id )->post_name );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertEmpty( get_post_meta( $post_id, '_customize_draft_post_name', true ) );

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'private', get_post_status( $private_post_id ) );

-               $this->assertEquals( 'trash', get_post_status( $trashed_post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'private', get_post_status( $private_post_id ) );

+               $this->assertSame( 'trash', get_post_status( $trashed_post_id ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Ensure that unique slugs were assigned.

</span><span class="cx" style="display: block; padding: 0 10px">                $posts      = array_map( 'get_post', $drafted_post_ids );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1058,7 +1058,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $results['can_partial_refresh'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'customize_preview_nav_menus_args', $results );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'wp_page_menu', $results['fallback_cb'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'wp_page_menu', $results['fallback_cb'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $nav_menu_term = get_term( wp_create_nav_menu( 'Bar' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $results       = $menus->filter_wp_nav_menu_args(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1072,7 +1072,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $results['can_partial_refresh'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'customize_preview_nav_menus_args', $results );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $nav_menu_term->term_id, $results['customize_preview_nav_menus_args']['menu'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $nav_menu_term->term_id, $results['customize_preview_nav_menus_args']['menu'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $results = $menus->filter_wp_nav_menu_args(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1144,7 +1144,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( ' data-customize-partial-type="nav_menu_instance"', $result );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( (bool) preg_match( '/data-customize-partial-placement-context="(.+?)"/', $result, $matches ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $context = json_decode( html_entity_decode( $matches[1] ), true );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $original_args, wp_array_slice_assoc( $context, array_keys( $original_args ) ) ); // Because assertArraySubset is not available in PHP 5.2.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $original_args, wp_array_slice_assoc( $context, array_keys( $original_args ) ) ); // Because assertArraySubset is not available in PHP 5.2.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $context['can_partial_refresh'] );

</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">@@ -1210,7 +1210,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $partials   = $this->wp_customize->selective_refresh->add_dynamic_partials( array( $partial_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $partials );

</span><span class="cx" style="display: block; padding: 0 10px">                $partial = array_shift( $partials );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $partial_id, $partial->id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $partial_id, $partial->id );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $missing_args_hmac_args = array_merge(

</span><span class="cx" style="display: block; padding: 0 10px">                        $nav_menu_args['customize_preview_nav_menus_args'],

</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     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/customize/panel.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,16 +32,16 @@

</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><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'int', $panel->instance_number );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->manager, $panel->manager );

-               $this->assertEquals( 'foo', $panel->id );

-               $this->assertEquals( 160, $panel->priority );

-               $this->assertEquals( 'edit_theme_options', $panel->capability );

-               $this->assertEquals( '', $panel->theme_supports );

-               $this->assertEquals( '', $panel->title );

-               $this->assertEquals( '', $panel->description );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->manager, $panel->manager );

+               $this->assertSame( 'foo', $panel->id );

+               $this->assertSame( 160, $panel->priority );

+               $this->assertSame( 'edit_theme_options', $panel->capability );

+               $this->assertSame( '', $panel->theme_supports );

+               $this->assertSame( '', $panel->title );

+               $this->assertSame( '', $panel->description );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEmpty( $panel->sections );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'default', $panel->type );

-               $this->assertEquals( array( $panel, 'active_callback' ), $panel->active_callback );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'default', $panel->type );

+               $this->assertSame( array( $panel, 'active_callback' ), $panel->active_callback );

</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">@@ -60,7 +60,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $panel = new WP_Customize_Panel( $this->manager, 'foo', $args );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $args as $key => $value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value, $panel->$key );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $value, $panel->$key );

</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">@@ -69,7 +69,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_construct_custom_type() {

</span><span class="cx" style="display: block; padding: 0 10px">                $panel = new Custom_Panel_Test( $this->manager, 'foo' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'titleless', $panel->type );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'titleless', $panel->type );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,9 +119,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $panel = new WP_Customize_Panel( $this->manager, 'foo', $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $data  = $panel->json();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foo', $data['id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foo', $data['id'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( array( 'title', 'description', 'priority', 'type' ) as $key ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $args[ $key ], $data[ $key ] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $args[ $key ], $data[ $key ] );

</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,8 +167,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $content = ob_get_clean();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $panel->check_capabilities() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( $content );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $customize_render_panel_count + 1, did_action( 'customize_render_panel' ), 'Unexpected did_action count for customize_render_panel' );

-               $this->assertEquals( 1, did_action( "customize_render_panel_{$panel->id}" ), "Unexpected did_action count for customize_render_panel_{$panel->id}" );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $customize_render_panel_count + 1, did_action( 'customize_render_panel' ), 'Unexpected did_action count for customize_render_panel' );

+               $this->assertSame( 1, did_action( "customize_render_panel_{$panel->id}" ), "Unexpected did_action count for customize_render_panel_{$panel->id}" );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span></span></pre></div>

<a id="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   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/customize/partial.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,15 +47,15 @@

</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">                $partial_id = 'blogname';

</span><span class="cx" style="display: block; padding: 0 10px">                $partial    = new WP_Customize_Partial( $this->selective_refresh, $partial_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $partial_id, $partial->id );

-               $this->assertEquals( $this->selective_refresh, $partial->component );

-               $this->assertEquals( 'default', $partial->type );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $partial_id, $partial->id );

+               $this->assertSame( $this->selective_refresh, $partial->component );

+               $this->assertSame( 'default', $partial->type );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEmpty( $partial->selector );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $partial_id ), $partial->settings );

-               $this->assertEquals( $partial_id, $partial->primary_setting );

-               $this->assertEquals( array( $partial, 'render_callback' ), $partial->render_callback );

-               $this->assertEquals( false, $partial->container_inclusive );

-               $this->assertEquals( true, $partial->fallback_refresh );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $partial_id ), $partial->settings );

+               $this->assertSame( $partial_id, $partial->primary_setting );

+               $this->assertSame( array( $partial, 'render_callback' ), $partial->render_callback );

+               $this->assertFalse( $partial->container_inclusive );

+               $this->assertTrue( $partial->fallback_refresh );

</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">@@ -102,15 +102,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'fallback_refresh'    => false,

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $partial    = new WP_Customize_Partial( $this->selective_refresh, $partial_id, $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $partial_id, $partial->id );

-               $this->assertEquals( $this->selective_refresh, $partial->component );

-               $this->assertEquals( $args['type'], $partial->type );

-               $this->assertEquals( $args['selector'], $partial->selector );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $partial_id, $partial->id );

+               $this->assertSame( $this->selective_refresh, $partial->component );

+               $this->assertSame( $args['type'], $partial->type );

+               $this->assertSame( $args['selector'], $partial->selector );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEqualSets( $args['settings'], $partial->settings );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $args['primary_setting'], $partial->primary_setting );

-               $this->assertEquals( $args['render_callback'], $partial->render_callback );

-               $this->assertEquals( false, $partial->container_inclusive );

-               $this->assertEquals( false, $partial->fallback_refresh );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $args['primary_setting'], $partial->primary_setting );

+               $this->assertSame( $args['render_callback'], $partial->render_callback );

+               $this->assertFalse( $partial->container_inclusive );

+               $this->assertFalse( $partial->fallback_refresh );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertContains( 'Lorem Ipsum', $partial->render() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $partial = new WP_Customize_Partial(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,8 +120,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'settings' => 'blogdescription',

</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->assertEquals( array( 'blogdescription' ), $partial->settings );

-               $this->assertEquals( 'blogdescription', $partial->primary_setting );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'blogdescription' ), $partial->settings );

+               $this->assertSame( 'blogdescription', $partial->primary_setting );

</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">@@ -132,13 +132,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_id_data() {

</span><span class="cx" style="display: block; padding: 0 10px">                $partial = new WP_Customize_Partial( $this->selective_refresh, 'foo' );

</span><span class="cx" style="display: block; padding: 0 10px">                $id_data = $partial->id_data();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foo', $id_data['base'] );

-               $this->assertEquals( array(), $id_data['keys'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foo', $id_data['base'] );

+               $this->assertSame( array(), $id_data['keys'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $partial = new WP_Customize_Partial( $this->selective_refresh, 'bar[baz][quux]' );

</span><span class="cx" style="display: block; padding: 0 10px">                $id_data = $partial->id_data();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'bar', $id_data['base'] );

-               $this->assertEquals( array( 'baz', 'quux' ), $id_data['keys'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'bar', $id_data['base'] );

+               $this->assertSame( array( 'baz', 'quux' ), $id_data['keys'] );

</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">@@ -180,7 +180,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * @return string|false Content.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function filter_customize_partial_render_with_id( $rendered, $partial, $container_context ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( sprintf( 'customize_partial_render_%s', $partial->id ), current_filter() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( 'customize_partial_render_%s', $partial->id ), current_filter() );

</ins><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><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $container_context );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,9 +249,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'customize_partial_render', array( $this, 'filter_customize_partial_render' ), 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( "customize_partial_render_{$partial->id}", array( $this, 'filter_customize_partial_render_with_id' ), 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px">                $rendered = $partial->render();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foo', $rendered );

-               $this->assertEquals( $count_filter_customize_partial_render + 1, $this->count_filter_customize_partial_render );

-               $this->assertEquals( $count_filter_customize_partial_render_with_id + 1, $this->count_filter_customize_partial_render_with_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foo', $rendered );

+               $this->assertSame( $count_filter_customize_partial_render + 1, $this->count_filter_customize_partial_render );

+               $this->assertSame( $count_filter_customize_partial_render_with_id + 1, $this->count_filter_customize_partial_render_with_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">@@ -272,9 +272,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'customize_partial_render', array( $this, 'filter_customize_partial_render' ), 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( "customize_partial_render_{$partial->id}", array( $this, 'filter_customize_partial_render_with_id' ), 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px">                $rendered = $partial->render();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'bar', $rendered );

-               $this->assertEquals( $count_filter_customize_partial_render + 1, $this->count_filter_customize_partial_render );

-               $this->assertEquals( $count_filter_customize_partial_render_with_id + 1, $this->count_filter_customize_partial_render_with_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'bar', $rendered );

+               $this->assertSame( $count_filter_customize_partial_render + 1, $this->count_filter_customize_partial_render );

+               $this->assertSame( $count_filter_customize_partial_render_with_id + 1, $this->count_filter_customize_partial_render_with_id );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span></span></pre></div>

<a id="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   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/customize/section.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,16 +39,16 @@

</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><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'int', $section->instance_number );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->manager, $section->manager );

-               $this->assertEquals( 'foo', $section->id );

-               $this->assertEquals( 160, $section->priority );

-               $this->assertEquals( 'edit_theme_options', $section->capability );

-               $this->assertEquals( '', $section->theme_supports );

-               $this->assertEquals( '', $section->title );

-               $this->assertEquals( '', $section->description );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->manager, $section->manager );

+               $this->assertSame( 'foo', $section->id );

+               $this->assertSame( 160, $section->priority );

+               $this->assertSame( 'edit_theme_options', $section->capability );

+               $this->assertSame( '', $section->theme_supports );

+               $this->assertSame( '', $section->title );

+               $this->assertSame( '', $section->description );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEmpty( $section->panel );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'default', $section->type );

-               $this->assertEquals( array( $section, 'active_callback' ), $section->active_callback );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'default', $section->type );

+               $this->assertSame( array( $section, 'active_callback' ), $section->active_callback );

</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">@@ -70,7 +70,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $section = new WP_Customize_Section( $this->manager, 'foo', $args );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $args as $key => $value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value, $section->$key );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $value, $section->$key );

</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">@@ -79,7 +79,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_construct_custom_type() {

</span><span class="cx" style="display: block; padding: 0 10px">                $section = new Custom_Section_Test( $this->manager, 'foo' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'titleless', $section->type );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'titleless', $section->type );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,9 +133,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $section = new WP_Customize_Section( $this->manager, 'foo', $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $data    = $section->json();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foo', $data['id'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foo', $data['id'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( array( 'title', 'description', 'priority', 'panel', 'type' ) as $key ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $args[ $key ], $data[ $key ] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $args[ $key ], $data[ $key ] );

</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,8 +180,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $content = ob_get_clean();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $section->check_capabilities() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( $content );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $customize_render_section_count + 1, did_action( 'customize_render_section' ), 'Unexpected did_action count for customize_render_section' );

-               $this->assertEquals( 1, did_action( "customize_render_section_{$section->id}" ), "Unexpected did_action count for customize_render_section_{$section->id}" );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $customize_render_section_count + 1, did_action( 'customize_render_section' ), 'Unexpected did_action count for customize_render_section' );

+               $this->assertSame( 1, did_action( "customize_render_section_{$section->id}" ), "Unexpected did_action count for customize_render_section_{$section->id}" );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span></span></pre></div>

<a id="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    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/customize/selective-refresh-ajax.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,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->assertFalse( $output['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'expected_customize_preview', $output['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'expected_customize_preview', $output['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check expected_customize_preview.

</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,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->assertFalse( $output['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'expected_customize_preview', $output['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'expected_customize_preview', $output['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check missing_partials.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->do_customize_boot_actions();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +104,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->assertFalse( $output['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'missing_partials', $output['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'missing_partials', $output['data'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check missing_partials.

</span><span class="cx" style="display: block; padding: 0 10px">                $_POST['partials'] = 'bad';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,11 +113,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->selective_refresh->handle_render_partials_request();

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPDieException $e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( '', $e->getMessage() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( '', $e->getMessage() );

</ins><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->assertFalse( $output['success'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'malformed_partials', $output['data'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'malformed_partials', $output['data'] );

</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">@@ -156,7 +156,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        add_action( 'customize_render_partials_after', array( $this, 'handle_action_customize_render_partials_after' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->selective_refresh->handle_render_partials_request();

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPDieException $e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( '', $e->getMessage() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( '', $e->getMessage() );

</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +164,7 @@

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( null, $output['data']['contents']['foo'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertNull( $output['data']['contents']['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">@@ -198,12 +198,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        add_action( 'customize_render_partials_after', array( $this, 'handle_action_customize_render_partials_after' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->selective_refresh->handle_render_partials_request();

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPDieException $e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( '', $e->getMessage() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( '', $e->getMessage() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $count_customize_render_partials_before + 1, has_action( 'customize_render_partials_before' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $count_customize_render_partials_after + 1, has_action( 'customize_render_partials_after' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $output = json_decode( ob_get_clean(), true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( false ), $output['data']['contents']['foo'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( false ), $output['data']['contents']['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">@@ -236,7 +236,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->selective_refresh->handle_render_partials_request();

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPDieException $e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( '', $e->getMessage() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( '', $e->getMessage() );

</ins><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->assertNull( $output['data']['contents']['secret_message'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,7 +266,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                try {

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->selective_refresh->handle_render_partials_request();

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPDieException $e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( '', $e->getMessage() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( '', $e->getMessage() );

</ins><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->assertNull( $output['data']['contents']['bar'] );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,12 +336,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        add_action( 'customize_render_partials_after', array( $this, 'handle_action_customize_render_partials_after' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->selective_refresh->handle_render_partials_request();

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPDieException $e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( '', $e->getMessage() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( '', $e->getMessage() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $count_customize_render_partials_before + 1, has_action( 'customize_render_partials_before' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $count_customize_render_partials_after + 1, has_action( 'customize_render_partials_after' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $output = json_decode( ob_get_clean(), true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( get_bloginfo( 'name', 'display' ) ), $output['data']['contents']['test_blogname'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( get_bloginfo( 'name', 'display' ) ), $output['data']['contents']['test_blogname'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'setting_validities', $output['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">@@ -445,12 +445,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        add_action( 'customize_render_partials_after', array( $this, 'handle_action_customize_render_partials_after' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->selective_refresh->handle_render_partials_request();

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPDieException $e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( '', $e->getMessage() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( '', $e->getMessage() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $count_customize_render_partials_before + 1, has_action( 'customize_render_partials_before' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $count_customize_render_partials_after + 1, has_action( 'customize_render_partials_after' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $output = json_decode( ob_get_clean(), true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( get_bloginfo( 'name', 'display' ) ), $output['data']['contents']['test_dynamic_blogname'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( get_bloginfo( 'name', 'display' ) ), $output['data']['contents']['test_dynamic_blogname'] );

</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">@@ -497,13 +497,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        add_action( 'customize_render_partials_after', array( $this, 'handle_action_customize_render_partials_after' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->selective_refresh->handle_render_partials_request();

</span><span class="cx" style="display: block; padding: 0 10px">                } catch ( WPDieException $e ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( '', $e->getMessage() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( '', $e->getMessage() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $count_customize_render_partials_before + 1, has_action( 'customize_render_partials_before' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $count_customize_render_partials_after + 1, has_action( 'customize_render_partials_after' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $output = json_decode( ob_get_clean(), true );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( get_bloginfo( 'name', 'display' ) ), $output['data']['contents']['test_blogname'] );

-               $this->assertEquals( array_fill( 0, 2, get_bloginfo( 'description', 'display' ) ), $output['data']['contents']['test_blogdescription'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( get_bloginfo( 'name', 'display' ) ), $output['data']['contents']['test_blogname'] );

+               $this->assertSame( array_fill( 0, 2, get_bloginfo( 'description', 'display' ) ), $output['data']['contents']['test_blogdescription'] );

</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="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 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/customize/selective-refresh.php   2020-09-02 00:35:36 UTC (rev 48937)

</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">         * @see WP_Customize_Selective_Refresh::__construct()

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_construct() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->selective_refresh, $this->wp_customize->selective_refresh );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->selective_refresh, $this->wp_customize->selective_refresh );

</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">@@ -83,9 +83,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_crud_partial() {

</span><span class="cx" style="display: block; padding: 0 10px">                $partial = $this->selective_refresh->add_partial( 'foo' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->selective_refresh, $partial->component );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->selective_refresh, $partial->component );

</ins><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->assertEquals( $partial, $this->selective_refresh->get_partial( $partial->id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $partial, $this->selective_refresh->get_partial( $partial->id ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( $partial->id, $this->selective_refresh->partials() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->selective_refresh->remove_partial( $partial->id );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,8 +93,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayNotHasKey( $partial->id, $this->selective_refresh->partials() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $partial = new WP_Customize_Partial( $this->selective_refresh, 'bar' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $partial, $this->selective_refresh->add_partial( $partial ) );

-               $this->assertEquals( $partial, $this->selective_refresh->get_partial( 'bar' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $partial, $this->selective_refresh->add_partial( $partial ) );

+               $this->assertSame( $partial, $this->selective_refresh->get_partial( 'bar' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEqualSets( array( 'bar' ), array_keys( $this->selective_refresh->partials() ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'customize_dynamic_partial_args', array( $this, 'filter_customize_dynamic_partial_args' ), 10, 2 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $partial = $this->selective_refresh->add_partial( 'recognized-class' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'Tested_Custom_Partial', $partial );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '.recognized', $partial->selector );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '.recognized', $partial->selector );

</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">@@ -112,8 +112,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_init_preview() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->selective_refresh->init_preview();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 10, has_action( 'template_redirect', array( $this->selective_refresh, 'handle_render_partials_request' ) ) );

-               $this->assertEquals( 10, has_action( 'wp_enqueue_scripts', array( $this->selective_refresh, 'enqueue_preview_scripts' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_action( 'template_redirect', array( $this->selective_refresh, 'handle_render_partials_request' ) ) );

+               $this->assertSame( 10, has_action( 'wp_enqueue_scripts', array( $this->selective_refresh, 'enqueue_preview_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">        /**

</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->assertNotContains( 'customize-selective-refresh', $scripts->queue );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->selective_refresh->enqueue_preview_scripts();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( 'customize-selective-refresh', $scripts->queue );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1000, has_action( 'wp_footer', array( $this->selective_refresh, 'export_preview_data' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1000, has_action( 'wp_footer', array( $this->selective_refresh, 'export_preview_data' ) ) );

</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">@@ -168,7 +168,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $exported_data['partials'] );

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '#site-title', $exported_data['partials']['blogname']['selector'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '#site-title', $exported_data['partials']['blogname']['selector'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'renderQueryVar', $exported_data );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'l10n', $exported_data );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +194,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'Tested_Custom_Partial', $this->selective_refresh->get_partial( 'recognized-class' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotInstanceOf( 'Tested_Custom_Partial', $this->selective_refresh->get_partial( 'recognized' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '.recognized', $this->selective_refresh->get_partial( 'recognized' )->selector );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '.recognized', $this->selective_refresh->get_partial( 'recognized' )->selector );

</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="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   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/customize/setting.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,19 +33,19 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_constructor_without_args() {

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Setting( $this->manager, 'foo' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->manager, $setting->manager );

-               $this->assertEquals( 'foo', $setting->id );

-               $this->assertEquals( 'theme_mod', $setting->type );

-               $this->assertEquals( 'edit_theme_options', $setting->capability );

-               $this->assertEquals( '', $setting->theme_supports );

-               $this->assertEquals( '', $setting->default );

-               $this->assertEquals( 'refresh', $setting->transport );

-               $this->assertEquals( '', $setting->sanitize_callback );

-               $this->assertEquals( '', $setting->sanitize_js_callback );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->manager, $setting->manager );

+               $this->assertSame( 'foo', $setting->id );

+               $this->assertSame( 'theme_mod', $setting->type );

+               $this->assertSame( 'edit_theme_options', $setting->capability );

+               $this->assertSame( '', $setting->theme_supports );

+               $this->assertSame( '', $setting->default );

+               $this->assertSame( 'refresh', $setting->transport );

+               $this->assertSame( '', $setting->sanitize_callback );

+               $this->assertSame( '', $setting->sanitize_js_callback );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( has_filter( "customize_validate_{$setting->id}" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_filter( "customize_sanitize_{$setting->id}" ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_filter( "customize_sanitize_js_{$setting->id}" ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( false, $setting->dirty );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( $setting->dirty );

</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">@@ -100,13 +100,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'sanitize_js_callback' => array( $this, 'sanitize_js_callback_for_tests' ),

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Setting( $this->manager, 'bar', $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'bar', $setting->id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'bar', $setting->id );

</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $args as $key => $value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $value, $setting->$key );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $value, $setting->$key );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 10, has_filter( "customize_validate_{$setting->id}", $args['validate_callback'] ) );

-               $this->assertEquals( 10, has_filter( "customize_sanitize_{$setting->id}", $args['sanitize_callback'] ) );

-               $this->assertEquals( 10, has_filter( "customize_sanitize_js_{$setting->id}", $args['sanitize_js_callback'] ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_filter( "customize_validate_{$setting->id}", $args['validate_callback'] ) );

+               $this->assertSame( 10, has_filter( "customize_sanitize_{$setting->id}", $args['sanitize_callback'] ) );

+               $this->assertSame( 10, has_filter( "customize_sanitize_js_{$setting->id}", $args['sanitize_js_callback'] ) );

</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 $post_data_overrides = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,11 +146,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $name    = "unset_{$type}_without_post_value";

</span><span class="cx" style="display: block; padding: 0 10px">                        $default = "default_value_{$name}";

</span><span class="cx" style="display: block; padding: 0 10px">                        $setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $this->undefined, call_user_func( $type_options['getter'], $name, $this->undefined ) );

-                       $this->assertEquals( $default, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $this->undefined, call_user_func( $type_options['getter'], $name, $this->undefined ) );

+                       $this->assertSame( $default, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( $setting->preview(), 'Preview should not no-op since setting has no existing value.' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $default, call_user_func( $type_options['getter'], $name, $this->undefined ), sprintf( 'Expected %s(%s) to return setting default: %s.', $type_options['getter'], $name, $default ) );

-                       $this->assertEquals( $default, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $default, call_user_func( $type_options['getter'], $name, $this->undefined ), sprintf( 'Expected %s(%s) to return setting default: %s.', $type_options['getter'], $name, $default ) );

+                       $this->assertSame( $default, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Non-multidimensional: See what effect the preview has on an extant setting (default value should not be seen).

</span><span class="cx" style="display: block; padding: 0 10px">                        $name          = "set_{$type}_without_post_value";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,40 +158,40 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $initial_value = "initial_value_{$name}";

</span><span class="cx" style="display: block; padding: 0 10px">                        call_user_func( $type_options['setter'], $name, $initial_value );

</span><span class="cx" style="display: block; padding: 0 10px">                        $setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $initial_value, call_user_func( $type_options['getter'], $name ) );

-                       $this->assertEquals( $initial_value, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $initial_value, call_user_func( $type_options['getter'], $name ) );

+                       $this->assertSame( $initial_value, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( $setting->preview(), 'Preview should no-op since setting value was extant and no post value was present.' );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 0, did_action( "customize_preview_{$setting->id}" ) ); // Only applicable for custom types (not options or theme_mods).

-                       $this->assertEquals( 0, did_action( "customize_preview_{$setting->type}" ) ); // Only applicable for custom types (not options or theme_mods).

-                       $this->assertEquals( $initial_value, call_user_func( $type_options['getter'], $name ) );

-                       $this->assertEquals( $initial_value, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 0, did_action( "customize_preview_{$setting->id}" ) ); // Only applicable for custom types (not options or theme_mods).

+                       $this->assertSame( 0, did_action( "customize_preview_{$setting->type}" ) ); // Only applicable for custom types (not options or theme_mods).

+                       $this->assertSame( $initial_value, call_user_func( $type_options['getter'], $name ) );

+                       $this->assertSame( $initial_value, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Non-multidimensional: Try updating a value that had a no-op preview.

</span><span class="cx" style="display: block; padding: 0 10px">                        $overridden_value = "overridden_value_$name";

</span><span class="cx" style="display: block; padding: 0 10px">                        call_user_func( $type_options['setter'], $name, $overridden_value );

</span><span class="cx" style="display: block; padding: 0 10px">                        $message = 'Initial value should be overridden because initial preview() was no-op due to setting having existing value and/or post value was absent.';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $overridden_value, call_user_func( $type_options['getter'], $name ), $message );

-                       $this->assertEquals( $overridden_value, $setting->value(), $message );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $overridden_value, call_user_func( $type_options['getter'], $name ), $message );

+                       $this->assertSame( $overridden_value, $setting->value(), $message );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertNotEquals( $initial_value, $setting->value(), $message );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Non-multidimensional: Ensure that setting a post value *after* preview() is called results in the post value being seen (deferred preview).

</span><span class="cx" style="display: block; padding: 0 10px">                        $post_value = "post_value_for_{$setting->id}_set_after_preview_called";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 0, did_action( "customize_post_value_set_{$setting->id}" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 0, did_action( "customize_post_value_set_{$setting->id}" ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->manager->set_post_value( $setting->id, $post_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 1, did_action( "customize_post_value_set_{$setting->id}" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 1, did_action( "customize_post_value_set_{$setting->id}" ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertNotEquals( $overridden_value, $setting->value() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $post_value, call_user_func( $type_options['getter'], $name ) );

-                       $this->assertEquals( $post_value, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $post_value, call_user_func( $type_options['getter'], $name ) );

+                       $this->assertSame( $post_value, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Non-multidimensional: Test unset setting being overridden by a post value.

</span><span class="cx" style="display: block; padding: 0 10px">                        $name    = "unset_{$type}_overridden";

</span><span class="cx" style="display: block; padding: 0 10px">                        $default = "default_value_{$name}";

</span><span class="cx" style="display: block; padding: 0 10px">                        $setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $this->undefined, call_user_func( $type_options['getter'], $name, $this->undefined ) );

-                       $this->assertEquals( $default, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $this->undefined, call_user_func( $type_options['getter'], $name, $this->undefined ) );

+                       $this->assertSame( $default, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( $setting->preview(), 'Preview applies because setting has post_data_overrides.' ); // Activate post_data.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $this->post_data_overrides[ $name ], call_user_func( $type_options['getter'], $name, $this->undefined ) );

-                       $this->assertEquals( $this->post_data_overrides[ $name ], $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $this->post_data_overrides[ $name ], call_user_func( $type_options['getter'], $name, $this->undefined ) );

+                       $this->assertSame( $this->post_data_overrides[ $name ], $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Non-multidimensional: Test set setting being overridden by a post value.

</span><span class="cx" style="display: block; padding: 0 10px">                        $name          = "set_{$type}_overridden";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,13 +199,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $initial_value = "initial_value_{$name}";

</span><span class="cx" style="display: block; padding: 0 10px">                        call_user_func( $type_options['setter'], $name, $initial_value );

</span><span class="cx" style="display: block; padding: 0 10px">                        $setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $initial_value, call_user_func( $type_options['getter'], $name, $this->undefined ) );

-                       $this->assertEquals( $initial_value, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $initial_value, call_user_func( $type_options['getter'], $name, $this->undefined ) );

+                       $this->assertSame( $initial_value, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( $setting->preview(), 'Preview applies because setting has post_data_overrides.' ); // Activate post_data.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 0, did_action( "customize_preview_{$setting->id}" ) ); // Only applicable for custom types (not options or theme_mods).

-                       $this->assertEquals( 0, did_action( "customize_preview_{$setting->type}" ) ); // Only applicable for custom types (not options or theme_mods).

-                       $this->assertEquals( $this->post_data_overrides[ $name ], call_user_func( $type_options['getter'], $name, $this->undefined ) );

-                       $this->assertEquals( $this->post_data_overrides[ $name ], $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 0, did_action( "customize_preview_{$setting->id}" ) ); // Only applicable for custom types (not options or theme_mods).

+                       $this->assertSame( 0, did_action( "customize_preview_{$setting->type}" ) ); // Only applicable for custom types (not options or theme_mods).

+                       $this->assertSame( $this->post_data_overrides[ $name ], call_user_func( $type_options['getter'], $name, $this->undefined ) );

+                       $this->assertSame( $this->post_data_overrides[ $name ], $setting->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"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,12 +225,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $name      = $base_name . '[foo]';

</span><span class="cx" style="display: block; padding: 0 10px">                        $default   = "default_value_{$name}";

</span><span class="cx" style="display: block; padding: 0 10px">                        $setting   = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $this->undefined, call_user_func( $type_options['getter'], $base_name, $this->undefined ) );

-                       $this->assertEquals( $default, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $this->undefined, call_user_func( $type_options['getter'], $base_name, $this->undefined ) );

+                       $this->assertSame( $default, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( $setting->preview(), "Preview for $setting->id should apply because setting is not in DB." );

</span><span class="cx" style="display: block; padding: 0 10px">                        $base_value = call_user_func( $type_options['getter'], $base_name, $this->undefined );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertArrayHasKey( 'foo', $base_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $default, $base_value['foo'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $default, $base_value['foo'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Multidimensional: See what effect the preview has on an extant setting (default value should not be seen) without post value.

</span><span class="cx" style="display: block; padding: 0 10px">                        $base_name          = "set_{$type}_multi";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,21 +244,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        call_user_func( $type_options['setter'], $base_name, $base_initial_value );

</span><span class="cx" style="display: block; padding: 0 10px">                        $setting    = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $base_value = call_user_func( $type_options['getter'], $base_name, array() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $initial_value, $base_value['foo'] );

-                       $this->assertEquals( $initial_value, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $initial_value, $base_value['foo'] );

+                       $this->assertSame( $initial_value, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertFalse( $setting->preview(), "Preview for $setting->id should no-op because setting is in DB and post value is absent." );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 0, did_action( "customize_preview_{$setting->id}" ) ); // Only applicable for custom types (not options or theme_mods).

-                       $this->assertEquals( 0, did_action( "customize_preview_{$setting->type}" ) ); // Only applicable for custom types (not options or theme_mods).

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 0, did_action( "customize_preview_{$setting->id}" ) ); // Only applicable for custom types (not options or theme_mods).

+                       $this->assertSame( 0, did_action( "customize_preview_{$setting->type}" ) ); // Only applicable for custom types (not options or theme_mods).

</ins><span class="cx" style="display: block; padding: 0 10px">                         $base_value = call_user_func( $type_options['getter'], $base_name, array() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $initial_value, $base_value['foo'] );

-                       $this->assertEquals( $initial_value, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $initial_value, $base_value['foo'] );

+                       $this->assertSame( $initial_value, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Multidimensional: Ensure that setting a post value *after* preview() is called results in the post value being seen (deferred preview).

</span><span class="cx" style="display: block; padding: 0 10px">                        $override_value = "post_value_for_{$setting->id}_set_after_preview_called";

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->manager->set_post_value( $setting->id, $override_value );

</span><span class="cx" style="display: block; padding: 0 10px">                        $base_value = call_user_func( $type_options['getter'], $base_name, array() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $override_value, $base_value['foo'] );

-                       $this->assertEquals( $override_value, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $override_value, $base_value['foo'] );

+                       $this->assertSame( $override_value, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Multidimensional: Test unset setting being overridden by a post value.

</span><span class="cx" style="display: block; padding: 0 10px">                        $base_name = "unset_{$type}_multi_overridden";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,14 +265,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $name      = $base_name . '[foo]';

</span><span class="cx" style="display: block; padding: 0 10px">                        $default   = "default_value_{$name}";

</span><span class="cx" style="display: block; padding: 0 10px">                        $setting   = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $this->undefined, call_user_func( $type_options['getter'], $base_name, $this->undefined ) );

-                       $this->assertEquals( $default, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $this->undefined, call_user_func( $type_options['getter'], $base_name, $this->undefined ) );

+                       $this->assertSame( $default, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( $setting->preview(), "Preview for $setting->id should apply because a post value is present." );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 0, did_action( "customize_preview_{$setting->id}" ) ); // Only applicable for custom types (not options or theme_mods).

-                       $this->assertEquals( 0, did_action( "customize_preview_{$setting->type}" ) ); // Only applicable for custom types (not options or theme_mods).

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 0, did_action( "customize_preview_{$setting->id}" ) ); // Only applicable for custom types (not options or theme_mods).

+                       $this->assertSame( 0, did_action( "customize_preview_{$setting->type}" ) ); // Only applicable for custom types (not options or theme_mods).

</ins><span class="cx" style="display: block; padding: 0 10px">                         $base_value = call_user_func( $type_options['getter'], $base_name, $this->undefined );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertArrayHasKey( 'foo', $base_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $this->post_data_overrides[ $name ], $base_value['foo'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $this->post_data_overrides[ $name ], $base_value['foo'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Multidimensional: Test set setting being overridden by a post value.

</span><span class="cx" style="display: block; padding: 0 10px">                        $base_name          = "set_{$type}_multi_overridden";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,21 +288,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $base_value = call_user_func( $type_options['getter'], $base_name, $this->undefined );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertArrayHasKey( 'foo', $base_value );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertArrayHasKey( 'bar', $base_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $base_initial_value['foo'], $base_value['foo'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $base_initial_value['foo'], $base_value['foo'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $getter = call_user_func( $type_options['getter'], $base_name, $this->undefined );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $base_initial_value['bar'], $getter['bar'] );

-                       $this->assertEquals( $initial_value, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $base_initial_value['bar'], $getter['bar'] );

+                       $this->assertSame( $initial_value, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( $setting->preview(), "Preview for $setting->id should apply because post value is present." );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 0, did_action( "customize_preview_{$setting->id}" ) ); // Only applicable for custom types (not options or theme_mods).

-                       $this->assertEquals( 0, did_action( "customize_preview_{$setting->type}" ) ); // Only applicable for custom types (not options or theme_mods).

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 0, did_action( "customize_preview_{$setting->id}" ) ); // Only applicable for custom types (not options or theme_mods).

+                       $this->assertSame( 0, did_action( "customize_preview_{$setting->type}" ) ); // Only applicable for custom types (not options or theme_mods).

</ins><span class="cx" style="display: block; padding: 0 10px">                         $base_value = call_user_func( $type_options['getter'], $base_name, $this->undefined );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertArrayHasKey( 'foo', $base_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $this->post_data_overrides[ $name ], $base_value['foo'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $this->post_data_overrides[ $name ], $base_value['foo'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertArrayHasKey( 'bar', call_user_func( $type_options['getter'], $base_name, $this->undefined ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $getter = call_user_func( $type_options['getter'], $base_name, $this->undefined );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $base_initial_value['bar'], $getter['bar'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $base_initial_value['bar'], $getter['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">@@ -343,7 +343,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $name = preg_replace( '/^customize_value_/', '', current_filter() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Customize_Setting', $setting );

</span><span class="cx" style="display: block; padding: 0 10px">                $id_data = $setting->id_data();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $name, $id_data['base'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $name, $id_data['base'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 return $this->custom_type_getter( $name, $default );

</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">@@ -381,13 +381,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );

<span class="cx" style="display: block; padding: 0 10px">                // Note: #29316 will allow us to have one filter for all settings of a given type, which is what we need.

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( "customize_value_{$name}", array( $this, 'custom_type_value_filter' ), 10, 2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->undefined, $this->custom_type_getter( $name, $this->undefined ) );

-               $this->assertEquals( $default, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->undefined, $this->custom_type_getter( $name, $this->undefined ) );

+               $this->assertSame( $default, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $setting->preview() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, did_action( "customize_preview_{$setting->id}" ) );

-               $this->assertEquals( 1, did_action( "customize_preview_{$setting->type}" ) );

-               $this->assertEquals( $this->undefined, $this->custom_type_getter( $name, $this->undefined ) ); // Note: for a non-custom type this is $default.

-               $this->assertEquals( $default, $setting->value() ); // Should be same as above.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, did_action( "customize_preview_{$setting->id}" ) );

+               $this->assertSame( 1, did_action( "customize_preview_{$setting->type}" ) );

+               $this->assertSame( $this->undefined, $this->custom_type_getter( $name, $this->undefined ) ); // Note: for a non-custom type this is $default.

+               $this->assertSame( $default, $setting->value() ); // Should be same as above.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Custom type existing and no post value override.

</span><span class="cx" style="display: block; padding: 0 10px">                $name          = "set_{$type}_without_post_value";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,19 +397,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );

<span class="cx" style="display: block; padding: 0 10px">                // Note: #29316 will allow us to have one filter for all settings of a given type, which is what we need.

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( "customize_value_{$name}", array( $this, 'custom_type_value_filter' ), 10, 2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $initial_value, $this->custom_type_getter( $name, $this->undefined ) );

-               $this->assertEquals( $initial_value, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $initial_value, $this->custom_type_getter( $name, $this->undefined ) );

+               $this->assertSame( $initial_value, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $setting->preview(), "Preview for $setting->id should not apply because existing type without an override." );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 0, did_action( "customize_preview_{$setting->id}" ), 'Zero preview actions because initial value is set with no incoming post value, so there is no preview to apply.' );

-               $this->assertEquals( 1, did_action( "customize_preview_{$setting->type}" ) );

-               $this->assertEquals( $initial_value, $this->custom_type_getter( $name, $this->undefined ) ); // Should be same as above.

-               $this->assertEquals( $initial_value, $setting->value() ); // Should be same as above.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, did_action( "customize_preview_{$setting->id}" ), 'Zero preview actions because initial value is set with no incoming post value, so there is no preview to apply.' );

+               $this->assertSame( 1, did_action( "customize_preview_{$setting->type}" ) );

+               $this->assertSame( $initial_value, $this->custom_type_getter( $name, $this->undefined ) ); // Should be same as above.

+               $this->assertSame( $initial_value, $setting->value() ); // Should be same as above.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Custom type deferred preview (setting post value after preview ran).

</span><span class="cx" style="display: block; padding: 0 10px">                $override_value = "custom_type_value_{$name}_override_deferred_preview";

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( $setting->id, $override_value );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $override_value, $this->custom_type_getter( $name, $this->undefined ) ); // Should be same as above.

-               $this->assertEquals( $override_value, $setting->value() ); // Should be same as above.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $override_value, $this->custom_type_getter( $name, $this->undefined ) ); // Should be same as above.

+               $this->assertSame( $override_value, $setting->value() ); // Should be same as above.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Custom type not existing and with a post value override.

</span><span class="cx" style="display: block; padding: 0 10px">                $name    = "unset_{$type}_with_post_value";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,13 +417,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );

<span class="cx" style="display: block; padding: 0 10px">                // Note: #29316 will allow us to have one filter for all settings of a given type, which is what we need.

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( "customize_value_{$name}", array( $this, 'custom_type_value_filter' ), 10, 2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->undefined, $this->custom_type_getter( $name, $this->undefined ) );

-               $this->assertEquals( $default, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->undefined, $this->custom_type_getter( $name, $this->undefined ) );

+               $this->assertSame( $default, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $setting->preview() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, did_action( "customize_preview_{$setting->id}" ), 'One preview action now because initial value was not set and/or there is no incoming post value, so there is is a preview to apply.' );

-               $this->assertEquals( 3, did_action( "customize_preview_{$setting->type}" ) );

-               $this->assertEquals( $post_data_overrides[ $name ], $this->custom_type_getter( $name, $this->undefined ) );

-               $this->assertEquals( $post_data_overrides[ $name ], $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, did_action( "customize_preview_{$setting->id}" ), 'One preview action now because initial value was not set and/or there is no incoming post value, so there is is a preview to apply.' );

+               $this->assertSame( 3, did_action( "customize_preview_{$setting->type}" ) );

+               $this->assertSame( $post_data_overrides[ $name ], $this->custom_type_getter( $name, $this->undefined ) );

+               $this->assertSame( $post_data_overrides[ $name ], $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Custom type not existing and with a post value override.

</span><span class="cx" style="display: block; padding: 0 10px">                $name          = "set_{$type}_with_post_value";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -433,13 +433,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );

<span class="cx" style="display: block; padding: 0 10px">                // Note: #29316 will allow us to have one filter for all settings of a given type, which is what we need.

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( "customize_value_{$name}", array( $this, 'custom_type_value_filter' ), 10, 2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $initial_value, $this->custom_type_getter( $name, $this->undefined ) );

-               $this->assertEquals( $initial_value, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $initial_value, $this->custom_type_getter( $name, $this->undefined ) );

+               $this->assertSame( $initial_value, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $setting->preview() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, did_action( "customize_preview_{$setting->id}" ) );

-               $this->assertEquals( 4, did_action( "customize_preview_{$setting->type}" ) );

-               $this->assertEquals( $post_data_overrides[ $name ], $this->custom_type_getter( $name, $this->undefined ) );

-               $this->assertEquals( $post_data_overrides[ $name ], $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, did_action( "customize_preview_{$setting->id}" ) );

+               $this->assertSame( 4, did_action( "customize_preview_{$setting->type}" ) );

+               $this->assertSame( $post_data_overrides[ $name ], $this->custom_type_getter( $name, $this->undefined ) );

+               $this->assertSame( $post_data_overrides[ $name ], $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Custom type that does not handle supplying the post value from the customize_value_{$id_base} filter.

</span><span class="cx" style="display: block; padding: 0 10px">                $setting_id = 'custom_without_previewing_value_filter';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,11 +478,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $name    = 'unset_option_without_post_value';

</span><span class="cx" style="display: block; padding: 0 10px">                $default = "default_value_{$name}";

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->undefined, get_option( $name, $this->undefined ) );

-               $this->assertEquals( $default, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->undefined, get_option( $name, $this->undefined ) );

+               $this->assertSame( $default, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $setting->preview() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $default, get_option( $name, $this->undefined ), sprintf( 'Expected get_option(%s) to return setting default: %s.', $name, $default ) );

-               $this->assertEquals( $default, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $default, get_option( $name, $this->undefined ), sprintf( 'Expected get_option(%s) to return setting default: %s.', $name, $default ) );

+               $this->assertSame( $default, $setting->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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,7 +527,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @param WP_Customize_Setting $setting

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function handle_customize_update_custom_foo_action( $value, $setting = null ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'hello world \\o/', $value );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'hello world \\o/', $value );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertInstanceOf( 'WP_Customize_Setting', $setting );

</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">@@ -539,8 +539,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function handle_customize_save_custom_foo_action( $setting ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Customize_Setting', $setting );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'custom', $setting->type );

-               $this->assertEquals( 'foo', $setting->id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'custom', $setting->type );

+               $this->assertSame( 'foo', $setting->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">@@ -561,8 +561,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $setting->preview() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $setting->is_current_blog_previewed() );

</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->assertEquals( $post_value, $setting->value() );

-               $this->assertEquals( $post_value, get_option( $name ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $post_value, $setting->value() );

+               $this->assertSame( $post_value, get_option( $name ) );

</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">@@ -610,8 +610,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( $setting->id, $value );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->save();

</span><span class="cx" style="display: block; padding: 0 10px">                $autoload = $wpdb->get_var( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $setting->id ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'yes', $autoload );

-               $this->assertEquals( $value, get_option( $name ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'yes', $autoload );

+               $this->assertSame( $value, get_option( $name ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $name    = 'autoloaded2';

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Setting(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,8 +626,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( $setting->id, $value );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->save();

</span><span class="cx" style="display: block; padding: 0 10px">                $autoload = $wpdb->get_var( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $setting->id ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'yes', $autoload );

-               $this->assertEquals( $value, get_option( $name ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'yes', $autoload );

+               $this->assertSame( $value, get_option( $name ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $name    = 'not-autoloaded1';

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Setting(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,8 +642,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( $setting->id, $value );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->save();

</span><span class="cx" style="display: block; padding: 0 10px">                $autoload = $wpdb->get_var( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $setting->id ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'no', $autoload );

-               $this->assertEquals( $value, get_option( $name ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'no', $autoload );

+               $this->assertSame( $value, get_option( $name ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $id_base  = 'multi-not-autoloaded';

</span><span class="cx" style="display: block; padding: 0 10px">                $setting1 = new WP_Customize_Setting(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -665,7 +665,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( $setting2->id, 'value2' );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting1->save();

</span><span class="cx" style="display: block; padding: 0 10px">                $autoload = $wpdb->get_var( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $id_base ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'no', $autoload, 'Even though setting1 did not indicate autoload (thus normally true), since another multidimensional option setting of the base did say autoload=false, it should be autoload=no' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'no', $autoload, 'Even though setting1 did not indicate autoload (thus normally true), since another multidimensional option setting of the base did say autoload=false, it should be autoload=no' );

</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">@@ -685,8 +685,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Setting( $this->manager, 'name', $args );

</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->assertEquals( $default, $setting->value() );

-               $this->assertEquals( base64_encode( $default ), $setting->js_value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $default, $setting->value() );

+               $this->assertSame( base64_encode( $default ), $setting->js_value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $exported = $setting->json();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'type', $exported );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -693,10 +693,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'value', $exported );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'transport', $exported );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'dirty', $exported );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $setting->js_value(), $exported['value'] );

-               $this->assertEquals( $args['type'], $setting->type );

-               $this->assertEquals( $args['transport'], $setting->transport );

-               $this->assertEquals( $args['dirty'], $setting->dirty );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $setting->js_value(), $exported['value'] );

+               $this->assertSame( $args['type'], $setting->type );

+               $this->assertSame( $args['transport'], $setting->transport );

+               $this->assertSame( $args['dirty'], $setting->dirty );

</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">@@ -715,7 +715,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $validity = $setting->validate( 'BAD!' );

</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->assertEquals( 'invalid_key', $validity->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_key', $validity->get_error_code() );

</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,13 +756,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $setting_id = 'nav_menu_locations[primary]';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = new WP_Customize_Setting( $this->manager, $setting_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $initial_value, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $initial_value, $setting->value() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $override_value = -123456;

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->set_post_value( $setting_id, $override_value );

</span><span class="cx" style="display: block; padding: 0 10px">                $setting->preview();

</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->assertEquals( $override_value, $setting->value() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $override_value, $setting->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"> 

</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   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/customize/widgets.php     2020-09-02 00:35:36 UTC (rev 48937)

</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">                $this->assertArrayHasKey( 2, get_option( 'widget_search' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $widget_categories = get_option( 'widget_categories' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 2, $widget_categories );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', $widget_categories[2]['title'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', $widget_categories[2]['title'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->backup_registered_sidebars = $GLOBALS['wp_registered_sidebars'];

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_construct() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'WP_Customize_Widgets', $this->manager->widgets );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->manager, $this->manager->widgets->manager );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->manager, $this->manager->widgets->manager );

</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">@@ -105,7 +105,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                delete_option( 'sidebars_widgets' );

</span><span class="cx" style="display: block; padding: 0 10px">                register_sidebar( array( 'id' => $sidebar_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->widgets->customize_register();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array_fill_keys( array( 'wp_inactive_widgets', $sidebar_id ), array() ), wp_get_sidebars_widgets() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array_fill_keys( array( 'wp_inactive_widgets', $sidebar_id ), array() ), wp_get_sidebars_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">        /**

</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">                $selective_refreshable_widgets = $this->manager->widgets->get_selective_refreshable_widgets();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $selective_refreshable_widgets );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( count( $wp_widget_factory->widgets ), count( $selective_refreshable_widgets ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( count( $wp_widget_factory->widgets ), count( $selective_refreshable_widgets ) );

</ins><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="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'search', $selective_refreshable_widgets );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,18 +206,18 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = $this->manager->get_setting( 'widget_categories[2]' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $setting, 'Expected setting for pre-existing widget category-2, being customized.' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_transport, $setting->transport );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_transport, $setting->transport );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = $this->manager->get_setting( 'widget_search[2]' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $setting, 'Expected setting for pre-existing widget search-2, not being customized.' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_transport, $setting->transport );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_transport, $setting->transport );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $setting = $this->manager->get_setting( 'widget_search[3]' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $setting, 'Expected dynamic setting for non-existing widget search-3, being customized.' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_transport, $setting->transport );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_transport, $setting->transport );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $widget_categories = get_option( 'widget_categories' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $raw_widget_customized['widget_categories[2]'], $widget_categories[2], 'Expected $wp_customize->get_setting(widget_categories[2])->preview() to have been called.' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $raw_widget_customized['widget_categories[2]'], $widget_categories[2], 'Expected $wp_customize->get_setting(widget_categories[2])->preview() to have been called.' );

</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">@@ -267,9 +267,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $args         = $this->manager->widgets->get_setting_args( 'widget_foo[2]' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $default_args as $key => $default_value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $default_value, $args[ $key ] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $default_value, $args[ $key ] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'WIDGET_FOO[2]', $args['uppercase_id_set_by_filter'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'WIDGET_FOO[2]', $args['uppercase_id_set_by_filter'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $default_args = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'type'                 => 'option',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,12 +281,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $args         = $this->manager->widgets->get_setting_args( 'widget_search[2]' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $default_args as $key => $default_value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $default_value, $args[ $key ] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $default_value, $args[ $key ] );

</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">                remove_theme_support( 'customize-selective-refresh-widgets' );

</span><span class="cx" style="display: block; padding: 0 10px">                $args = $this->manager->widgets->get_setting_args( 'widget_search[2]' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'refresh', $args['transport'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'refresh', $args['transport'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 add_theme_support( 'customize-selective-refresh-widgets' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $override_args = array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,9 +299,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $args          = $this->manager->widgets->get_setting_args( 'widget_bar[3]', $override_args );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $override_args as $key => $override_value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $override_value, $args[ $key ] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $override_value, $args[ $key ] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'WIDGET_BAR[3]', $args['uppercase_id_set_by_filter'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'WIDGET_BAR[3]', $args['uppercase_id_set_by_filter'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $default_args = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'type'                 => 'option',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,9 +313,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $args         = $this->manager->widgets->get_setting_args( 'sidebars_widgets[sidebar-1]' );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $default_args as $key => $default_value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $default_value, $args[ $key ] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $default_value, $args[ $key ] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'SIDEBARS_WIDGETS[SIDEBAR-1]', $args['uppercase_id_set_by_filter'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'SIDEBARS_WIDGETS[SIDEBAR-1]', $args['uppercase_id_set_by_filter'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $override_args = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'type'                 => 'theme_mod',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,9 +327,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $args          = $this->manager->widgets->get_setting_args( 'sidebars_widgets[sidebar-2]', $override_args );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $override_args as $key => $override_value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $override_value, $args[ $key ] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $override_value, $args[ $key ] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'SIDEBARS_WIDGETS[SIDEBAR-2]', $args['uppercase_id_set_by_filter'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'SIDEBARS_WIDGETS[SIDEBAR-2]', $args['uppercase_id_set_by_filter'] );

</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 filter_widget_customizer_setting_args( $args, $id ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +353,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $sanitized_for_js = $this->manager->widgets->sanitize_widget_js_instance( $new_categories_instance );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'encoded_serialized_instance', $sanitized_for_js );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( is_serialized( base64_decode( $sanitized_for_js['encoded_serialized_instance'] ), true ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $new_categories_instance['title'], $sanitized_for_js['title'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $new_categories_instance['title'], $sanitized_for_js['title'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $sanitized_for_js['is_widget_customizer_js_value'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'instance_hash_key', $sanitized_for_js );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,7 +362,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNull( $this->manager->widgets->sanitize_widget_instance( $corrupted_sanitized_for_js ), 'Expected sanitize_widget_instance to reject corrupted data.' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $unsanitized_from_js = $this->manager->widgets->sanitize_widget_instance( $sanitized_for_js );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $unsanitized_from_js, $new_categories_instance );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $unsanitized_from_js, $new_categories_instance );

</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">@@ -425,14 +425,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $control = $this->manager->get_control( 'widget_search[2]' );

</span><span class="cx" style="display: block; padding: 0 10px">                $params  = $control->json();

</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->assertEquals( 'widget_form', $params['type'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'widget_form', $params['type'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertRegExp( '#^<li[^>]+>\s*</li>$#', $params['content'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertRegExp( '#^<div[^>]*class=\'widget\'[^>]*#s', $params['widget_control'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( '<div class="widget-content"></div>', $params['widget_control'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( '<input class="widefat"', $params['widget_control'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( '<input class="widefat"', $params['widget_content'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'search-2', $params['widget_id'] );

-               $this->assertEquals( 'search', $params['widget_id_base'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'search-2', $params['widget_id'] );

+               $this->assertSame( 'search', $params['widget_id_base'] );

</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +496,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $result );

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $instance, $result['instance'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $instance, $result['instance'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertContains( sprintf( 'value="%s"', esc_attr( $instance['title'] ) ), $result['form'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $post_values = $this->manager->unsanitized_post_values();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -507,7 +507,7 @@

</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="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'is_widget_customizer_js_value', $post_value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $post_value, $this->manager->widgets->sanitize_widget_js_instance( $instance ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $post_value, $this->manager->widgets->sanitize_widget_js_instance( $instance ) );

</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">@@ -520,14 +520,14 @@

</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><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'widget', $args['type'] );

-               $this->assertEquals( array( $this->manager->widgets, 'render_widget_partial' ), $args['render_callback'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'widget', $args['type'] );

+               $this->assertSame( array( $this->manager->widgets, 'render_widget_partial' ), $args['render_callback'] );

</ins><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><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $args );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'widget', $args['type'] );

-               $this->assertEquals( array( $this->manager->widgets, 'render_widget_partial' ), $args['render_callback'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'widget', $args['type'] );

+               $this->assertSame( array( $this->manager->widgets, 'render_widget_partial' ), $args['render_callback'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $args['container_inclusive'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $args['fallback_refresh'] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -544,10 +544,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_selective_refresh_init_with_theme_support() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_theme_support( 'customize-selective-refresh-widgets' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->manager->widgets->selective_refresh_init();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 10, has_action( 'dynamic_sidebar_before', array( $this->manager->widgets, 'start_dynamic_sidebar' ) ) );

-               $this->assertEquals( 10, has_action( 'dynamic_sidebar_after', array( $this->manager->widgets, 'end_dynamic_sidebar' ) ) );

-               $this->assertEquals( 10, has_filter( 'dynamic_sidebar_params', array( $this->manager->widgets, 'filter_dynamic_sidebar_params' ) ) );

-               $this->assertEquals( 10, has_filter( 'wp_kses_allowed_html', array( $this->manager->widgets, 'filter_wp_kses_allowed_data_attributes' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_action( 'dynamic_sidebar_before', array( $this->manager->widgets, 'start_dynamic_sidebar' ) ) );

+               $this->assertSame( 10, has_action( 'dynamic_sidebar_after', array( $this->manager->widgets, 'end_dynamic_sidebar' ) ) );

+               $this->assertSame( 10, has_filter( 'dynamic_sidebar_params', array( $this->manager->widgets, 'filter_dynamic_sidebar_params' ) ) );

+               $this->assertSame( 10, has_filter( 'wp_kses_allowed_html', array( $this->manager->widgets, 'filter_wp_kses_allowed_data_attributes' ) ) );

</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">@@ -603,24 +603,24 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        array(),

</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->assertEquals( $params, $this->manager->widgets->filter_dynamic_sidebar_params( $params ), 'Expected short-circuit if not called after dynamic_sidebar_before.' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $params, $this->manager->widgets->filter_dynamic_sidebar_params( $params ), 'Expected short-circuit if not called after dynamic_sidebar_before.' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                ob_start();

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'dynamic_sidebar_before', 'foo' );

</span><span class="cx" style="display: block; padding: 0 10px">                $output = ob_get_clean();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '<!--dynamic_sidebar_before:foo:1-->', trim( $output ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '<!--dynamic_sidebar_before:foo:1-->', trim( $output ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $bad_params = $params;

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $bad_params[0]['id'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $bad_params, $this->manager->widgets->filter_dynamic_sidebar_params( $bad_params ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $bad_params, $this->manager->widgets->filter_dynamic_sidebar_params( $bad_params ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $bad_params          = $params;

</span><span class="cx" style="display: block; padding: 0 10px">                $bad_params[0]['id'] = 'non-existing';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $bad_params, $this->manager->widgets->filter_dynamic_sidebar_params( $bad_params ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $bad_params, $this->manager->widgets->filter_dynamic_sidebar_params( $bad_params ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $bad_params                     = $params;

</span><span class="cx" style="display: block; padding: 0 10px">                $bad_params[0]['before_widget'] = '   <oops>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $bad_params, $this->manager->widgets->filter_dynamic_sidebar_params( $bad_params ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $bad_params, $this->manager->widgets->filter_dynamic_sidebar_params( $bad_params ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $filtered_params = $this->manager->widgets->filter_dynamic_sidebar_params( $params );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $params, $filtered_params );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -627,7 +627,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                ob_start();

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'dynamic_sidebar_after', 'foo' );

</span><span class="cx" style="display: block; padding: 0 10px">                $output = ob_get_clean();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '<!--dynamic_sidebar_after:foo:1-->', trim( $output ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '<!--dynamic_sidebar_after:foo:1-->', trim( $output ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $output = wp_kses_post( $filtered_params[0]['before_widget'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( 'data-customize-partial-id="widget[search-2]"', $output );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -648,7 +648,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $partials   = $this->manager->selective_refresh->add_dynamic_partials( array( $partial_id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $partials );

</span><span class="cx" style="display: block; padding: 0 10px">                $partial = array_shift( $partials );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $partial_id, $partial->id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $partial_id, $partial->id );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->manager->widgets->render_widget_partial( $partial, array() ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $this->manager->widgets->render_widget_partial( $partial, array( 'sidebar_id' => 'non-existing' ) ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,8 +655,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $output = $this->manager->widgets->render_widget_partial( $partial, array( 'sidebar_id' => 'sidebar-1' ) );

</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->assertEquals( 1, substr_count( $output, 'data-customize-partial-id' ) );

-               $this->assertEquals( 1, substr_count( $output, 'data-customize-partial-type="widget"' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, substr_count( $output, 'data-customize-partial-id' ) );

+               $this->assertSame( 1, substr_count( $output, 'data-customize-partial-type="widget"' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertContains( ' id="search-2"', $output );

</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="trunktestsphpunittestsdatedateI18nphp"></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/dateI18n.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/dateI18n.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/dateI18n.php 2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,8 +33,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $rfc3339  = $datetime->format( DATE_RFC3339 );

</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->assertEquals( 0, date_i18n( 'U', 0 ) );

-               $this->assertEquals( $rfc3339, date_i18n( DATE_RFC3339, 0 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 0, date_i18n( 'U', 0 ) );

+               $this->assertSame( $rfc3339, date_i18n( DATE_RFC3339, 0 ) );

</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_should_format_date() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,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">        public function test_should_use_custom_timestamp() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '2012-12-01 00:00:00', date_i18n( 'Y-m-d H:i:s', strtotime( '2012-12-01 00:00:00' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '2012-12-01 00:00:00', date_i18n( 'Y-m-d H:i:s', strtotime( '2012-12-01 00:00:00' ) ) );

</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_date_should_be_in_gmt() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_date_should_be_in_gmt_with_custom_timezone_setting_and_timestamp() {

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'timezone_string', 'America/Regina' );

</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->assertEquals( '2012-12-01 00:00:00', date_i18n( 'Y-m-d H:i:s', strtotime( '2012-12-01 00:00:00' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '2012-12-01 00:00:00', date_i18n( 'Y-m-d H:i:s', strtotime( '2012-12-01 00:00:00' ) ) );

</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_adjusts_format_based_on_locale() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,13 +87,13 @@

<span class="cx" style="display: block; padding: 0 10px">                // Restore original locale.

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['wp_locale'] = $original_locale;

</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->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_adjusts_format_based_on_timezone_string() {

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'timezone_string', 'America/Regina' );

</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->assertEquals( '2012-12-01 00:00:00 CST -06:00 America/Regina', date_i18n( 'Y-m-d H:i:s T P e', strtotime( '2012-12-01 00:00:00' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '2012-12-01 00:00:00 CST -06:00 America/Regina', date_i18n( 'Y-m-d H:i:s T P e', strtotime( '2012-12-01 00:00:00' ) ) );

</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">@@ -110,7 +110,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $datetime = new DateTime( 'now', $datetimezone );

</span><span class="cx" style="display: block; padding: 0 10px">                $datetime = new DateTime( $datetime->format( 'P' ) );

</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->assertEquals( $datetime->format( $timezone_formats ), date_i18n( $timezone_formats ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $datetime->format( $timezone_formats ), date_i18n( $timezone_formats ) );

</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">@@ -122,7 +122,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'timezone_string', 'America/Regina' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( strtotime( date_i18n( $full ) ), strtotime( date_i18n( $short ) ), 'The dates should be equal', 2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $short, date_i18n( '\\' . $short ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $short, date_i18n( '\\' . $short ) );

</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 data_formats() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $wp_timestamp, date_i18n( 'U' ), 'The dates should be equal', 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $timestamp, date_i18n( 'U', false, true ), 'The dates should be equal', 2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $wp_timestamp, date_i18n( 'U', $wp_timestamp ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $wp_timestamp, date_i18n( 'U', $wp_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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_swatch_internet_time_with_wp_timestamp() {

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'timezone_string', 'America/Regina' );

</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->assertEquals( gmdate( 'B' ), date_i18n( 'B' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( gmdate( 'B' ), date_i18n( 'B' ) );

</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">@@ -168,7 +168,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_should_handle_escaped_formats() {

</span><span class="cx" style="display: block; padding: 0 10px">                $format = 'D | \D | \\D | \\\D | \\\\D | \\\\\D | \\\\\\D';

</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->assertEquals( gmdate( $format ), date_i18n( $format ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( gmdate( $format ), date_i18n( $format ) );

</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">@@ -187,7 +187,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_timestamp = strtotime( $time );

</span><span class="cx" style="display: block; padding: 0 10px">                $format       = 'I ' . DATE_RFC3339;

</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->assertEquals( $datetime->format( $format ), date_i18n( $format, $wp_timestamp ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $datetime->format( $format ), date_i18n( $format, $wp_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">        public function dst_times() {

</span></span></pre></div>

<a id="trunktestsphpunittestsdategetCommentDatephp"></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/getCommentDate.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/getCommentDate.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/getCommentDate.php   2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_comment_date_returns_correct_time_with_comment_id() {

</span><span class="cx" style="display: block; padding: 0 10px">                $c = self::factory()->comment->create( array( 'comment_date' => '2020-08-29 01:51:00' ) );

</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->assertEquals( 'August 29, 2020', get_comment_date( 'F j, Y', $c ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'August 29, 2020', get_comment_date( 'F j, Y', $c ) );

</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">@@ -22,8 +22,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_comment_date_returns_correct_time_with_empty_format() {

</span><span class="cx" style="display: block; padding: 0 10px">                $c = self::factory()->comment->create( array( 'comment_date' => '2020-08-29 01:51:00' ) );

</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->assertEquals( 'August 29, 2020', get_comment_date( '', $c ) );

-               $this->assertEquals( 'August 29, 2020', get_comment_date( false, $c ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'August 29, 2020', get_comment_date( '', $c ) );

+               $this->assertSame( 'August 29, 2020', get_comment_date( false, $c ) );

</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">@@ -33,7 +33,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $c = self::factory()->comment->create( array( 'comment_date' => '2020-08-29 01:51:00' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['comment'] = get_comment( $c );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '1:51 am', get_comment_time( 'g:i a' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '1:51 am', get_comment_time( 'g:i a' ) );

</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">                $c = self::factory()->comment->create( array( 'comment_date' => '2020-08-29 01:51:00' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['comment'] = get_comment( $c );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '1:51 am', get_comment_time( '' ) );

-               $this->assertEquals( '1:51 am', get_comment_time( false ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '1:51 am', get_comment_time( '' ) );

+               $this->assertSame( '1:51 am', get_comment_time( false ) );

</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="trunktestsphpunittestsdategetFeedBuildDatephp"></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/getFeedBuildDate.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/getFeedBuildDate.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/getFeedBuildDate.php 2020-09-02 00:35:36 UTC (rev 48937)

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_query = new WP_Query( array( 'p' => $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->assertEquals( '2018-07-23T03:13:23+00:00', get_feed_build_date( DATE_RFC3339 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '2018-07-23T03:13:23+00:00', get_feed_build_date( DATE_RFC3339 ) );

</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="trunktestsphpunittestsdategetPermalinkphp"></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/getPermalink.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/getPermalink.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/getPermalink.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,10 +33,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.org/2018/07/22/21/13/23', get_permalink( $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.org/2018/07/22/21/13/23', get_permalink( $post_id ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set

</span><span class="cx" style="display: block; padding: 0 10px">                date_default_timezone_set( $timezone );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.org/2018/07/22/21/13/23', get_permalink( $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.org/2018/07/22/21/13/23', get_permalink( $post_id ) );

</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="trunktestsphpunittestsdategetPostTimephp"></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/getPostTime.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/getPostTime.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/getPostTime.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_post_time_returns_correct_time_with_post_id() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );

</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->assertEquals( '16:35:00', get_post_time( 'H:i:s', false, $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '16:35:00', get_post_time( 'H:i:s', false, $post_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">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_post_modified_time_returns_correct_time_with_post_id() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );

</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->assertEquals( '16:35:00', get_post_modified_time( 'H:i:s', false, $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '16:35:00', get_post_modified_time( 'H:i:s', false, $post_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">@@ -64,14 +64,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $wp_timestamp, get_post_time( 'U', false, $post_id ) );

-               $this->assertEquals( $wp_timestamp, get_post_time( 'G', false, $post_id ) );

-               $this->assertEquals( $timestamp, get_post_time( 'U', true, $post_id ) );

-               $this->assertEquals( $timestamp, get_post_time( 'G', true, $post_id ) );

-               $this->assertEquals( $wp_timestamp, get_post_modified_time( 'U', false, $post_id ) );

-               $this->assertEquals( $wp_timestamp, get_post_modified_time( 'G', false, $post_id ) );

-               $this->assertEquals( $timestamp, get_post_modified_time( 'U', true, $post_id ) );

-               $this->assertEquals( $timestamp, get_post_modified_time( 'G', true, $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $wp_timestamp, get_post_time( 'U', false, $post_id ) );

+               $this->assertSame( $wp_timestamp, get_post_time( 'G', false, $post_id ) );

+               $this->assertSame( $timestamp, get_post_time( 'U', true, $post_id ) );

+               $this->assertSame( $timestamp, get_post_time( 'G', true, $post_id ) );

+               $this->assertSame( $wp_timestamp, get_post_modified_time( 'U', false, $post_id ) );

+               $this->assertSame( $wp_timestamp, get_post_modified_time( 'G', false, $post_id ) );

+               $this->assertSame( $timestamp, get_post_modified_time( 'U', true, $post_id ) );

+               $this->assertSame( $timestamp, get_post_modified_time( 'G', true, $post_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">@@ -92,14 +92,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $rfc3339, get_post_time( DATE_RFC3339, false, $post_id ) );

-               $this->assertEquals( $rfc3339_utc, get_post_time( DATE_RFC3339, true, $post_id ) );

-               $this->assertEquals( $rfc3339, get_post_time( DATE_RFC3339, false, $post_id, true ) );

-               $this->assertEquals( $rfc3339_utc, get_post_time( DATE_RFC3339, true, $post_id, true ) );

-               $this->assertEquals( $rfc3339, get_post_modified_time( DATE_RFC3339, false, $post_id ) );

-               $this->assertEquals( $rfc3339_utc, get_post_modified_time( DATE_RFC3339, true, $post_id ) );

-               $this->assertEquals( $rfc3339, get_post_modified_time( DATE_RFC3339, false, $post_id, true ) );

-               $this->assertEquals( $rfc3339_utc, get_post_modified_time( DATE_RFC3339, true, $post_id, true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $rfc3339, get_post_time( DATE_RFC3339, false, $post_id ) );

+               $this->assertSame( $rfc3339_utc, get_post_time( DATE_RFC3339, true, $post_id ) );

+               $this->assertSame( $rfc3339, get_post_time( DATE_RFC3339, false, $post_id, true ) );

+               $this->assertSame( $rfc3339_utc, get_post_time( DATE_RFC3339, true, $post_id, true ) );

+               $this->assertSame( $rfc3339, get_post_modified_time( DATE_RFC3339, false, $post_id ) );

+               $this->assertSame( $rfc3339_utc, get_post_modified_time( DATE_RFC3339, true, $post_id ) );

+               $this->assertSame( $rfc3339, get_post_modified_time( DATE_RFC3339, false, $post_id, true ) );

+               $this->assertSame( $rfc3339_utc, get_post_modified_time( DATE_RFC3339, true, $post_id, true ) );

</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">@@ -121,7 +121,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'timezone_string', 'Europe/Kiev' );

</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->assertEquals( $rfc3339, get_post_time( DATE_RFC3339, true, $post_id ) );

-               $this->assertEquals( $rfc3339, get_post_modified_time( DATE_RFC3339, true, $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $rfc3339, get_post_time( DATE_RFC3339, true, $post_id ) );

+               $this->assertSame( $rfc3339, get_post_modified_time( DATE_RFC3339, true, $post_id ) );

</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="trunktestsphpunittestsdategetTheDatephp"></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/getTheDate.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/getTheDate.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/getTheDate.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_the_date_returns_correct_time_with_post_id() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );

</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->assertEquals( 'March 1, 2014', get_the_date( 'F j, Y', $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'March 1, 2014', get_the_date( 'F j, Y', $post_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">@@ -32,8 +32,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_the_date_returns_correct_time_with_empty_format() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create( array( 'post_date' => '2020-08-29 01:51:00' ) );

</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->assertEquals( 'August 29, 2020', get_the_date( '', $post_id ) );

-               $this->assertEquals( 'August 29, 2020', get_the_date( false, $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'August 29, 2020', get_the_date( '', $post_id ) );

+               $this->assertSame( 'August 29, 2020', get_the_date( false, $post_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">@@ -42,7 +42,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_the_time_returns_correct_time_with_post_id() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );

</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->assertEquals( '16:35:00', get_the_time( 'H:i:s', $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '16:35:00', get_the_time( 'H:i:s', $post_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">@@ -61,7 +61,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_the_time_returns_correct_time_with_empty_format() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create( array( 'post_date' => '2020-08-29 01:51:00' ) );

</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->assertEquals( '1:51 am', get_the_time( '', $post_id ) );

-               $this->assertEquals( '1:51 am', get_the_time( false, $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '1:51 am', get_the_time( '', $post_id ) );

+               $this->assertSame( '1:51 am', get_the_time( false, $post_id ) );

</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="trunktestsphpunittestsdategetTheModifiedDatephp"></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/getTheModifiedDate.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/getTheModifiedDate.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/getTheModifiedDate.php       2020-09-02 00:35:36 UTC (rev 48937)

</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">                $format   = 'Y-m-d';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '2016-01-21';

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = get_the_modified_date( $format, $post_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '2016-01-21';

</span><span class="cx" style="display: block; padding: 0 10px">                $format   = 'Y-m-d';

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = get_the_modified_date( $format );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'filtered modified date failure result';

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'get_the_modified_date', array( $this, '_filter_get_the_modified_date_failure' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = get_the_modified_date();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'get_the_modified_date', array( $this, '_filter_get_the_modified_date_failure' ) );

</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">@@ -70,7 +70,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function _filter_get_the_modified_date_failure( $the_date ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = false;

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = $the_date;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( false === $the_date ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return 'filtered modified date failure result';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,8 +94,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_the_modified_date_returns_correct_time_with_empty_format() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create( array( 'post_date' => '2020-08-31 23:14:00' ) );

</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->assertEquals( 'August 31, 2020', get_the_modified_date( '', $post_id ) );

-               $this->assertEquals( 'August 31, 2020', get_the_modified_date( false, $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'August 31, 2020', get_the_modified_date( '', $post_id ) );

+               $this->assertSame( 'August 31, 2020', get_the_modified_date( false, $post_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">@@ -112,9 +112,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id  = $this->factory->post->create( $details );

</span><span class="cx" style="display: block; padding: 0 10px">                $format   = 'G';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $expected = '1453390476';

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $expected = 1453390476;

</ins><span class="cx" style="display: block; padding: 0 10px">                 $actual   = get_the_modified_time( $format, $post_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,10 +134,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['post'] = $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">-                $expected = '1453390476';

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $expected = 1453390476;

</ins><span class="cx" style="display: block; padding: 0 10px">                 $format   = 'G';

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = get_the_modified_time( $format );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'filtered modified time failure result';

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'get_the_modified_time', array( $this, '_filter_get_the_modified_time_failure' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = get_the_modified_time();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'get_the_modified_time', array( $this, '_filter_get_the_modified_time_failure' ) );

</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">@@ -161,7 +161,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function _filter_get_the_modified_time_failure( $the_time ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = false;

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = $the_time;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                if ( false === $the_time ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        return 'filtered modified time failure result';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +185,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_the_modified_time_returns_correct_time_with_empty_format() {

</span><span class="cx" style="display: block; padding: 0 10px">                $post_id = self::factory()->post->create( array( 'post_date' => '2020-08-31 23:14:00' ) );

</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->assertEquals( '11:14 pm', get_the_modified_time( '', $post_id ) );

-               $this->assertEquals( '11:14 pm', get_the_modified_time( false, $post_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '11:14 pm', get_the_modified_time( '', $post_id ) );

+               $this->assertSame( '11:14 pm', get_the_modified_time( false, $post_id ) );

</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="trunktestsphpunittestsdatemaybeDeclineDatephp"></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/maybeDeclineDate.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/maybeDeclineDate.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/maybeDeclineDate.php 2020-09-02 00:35:36 UTC (rev 48937)

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'gettext_with_context', array( $this, 'filter__enable_months_names_declension' ), 10 );

</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->assertEquals( $output, $declined_date );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $output, $declined_date );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function filter__enable_months_names_declension( $translation, $text, $context ) {

</span></span></pre></div>

<a id="trunktestsphpunittestsdatemysql2datephp"></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/mysql2date.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/mysql2date.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/mysql2date.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,8 +24,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 28310

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_mysql2date_returns_gmt_or_unix_timestamp() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '441013392', mysql2date( 'G', '1983-12-23 07:43:12' ) );

-               $this->assertEquals( '441013392', mysql2date( 'U', '1983-12-23 07:43:12' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 441013392, mysql2date( 'G', '1983-12-23 07:43:12' ) );

+               $this->assertSame( 441013392, mysql2date( 'U', '1983-12-23 07:43:12' ) );

</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">@@ -38,8 +38,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $rfc3339  = $datetime->format( DATE_RFC3339 );

</span><span class="cx" style="display: block; padding: 0 10px">                $mysql    = $datetime->format( 'Y-m-d H:i:s' );

</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->assertEquals( $rfc3339, mysql2date( DATE_RFC3339, $mysql ) );

-               $this->assertEquals( $rfc3339, mysql2date( DATE_RFC3339, $mysql, false ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $rfc3339, mysql2date( DATE_RFC3339, $mysql ) );

+               $this->assertSame( $rfc3339, mysql2date( DATE_RFC3339, $mysql, false ) );

</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,8 +54,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $rfc3339  = $datetime->format( DATE_RFC3339 );

</span><span class="cx" style="display: block; padding: 0 10px">                $mysql    = $datetime->format( 'Y-m-d H:i:s' );

</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->assertEquals( $rfc3339, mysql2date( DATE_RFC3339, $mysql ) );

-               $this->assertEquals( $rfc3339, mysql2date( DATE_RFC3339, $mysql, false ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $rfc3339, mysql2date( DATE_RFC3339, $mysql ) );

+               $this->assertSame( $rfc3339, mysql2date( DATE_RFC3339, $mysql, false ) );

</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">@@ -68,8 +68,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_timestamp = $datetime->getTimestamp() + $datetime->getOffset();

</span><span class="cx" style="display: block; padding: 0 10px">                $mysql        = $datetime->format( 'Y-m-d H:i:s' );

</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->assertEquals( $wp_timestamp, mysql2date( 'U', $mysql, false ) );

-               $this->assertEquals( $wp_timestamp, mysql2date( 'G', $mysql, false ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $wp_timestamp, mysql2date( 'U', $mysql, false ) );

+               $this->assertSame( $wp_timestamp, mysql2date( 'G', $mysql, false ) );

</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">@@ -82,7 +82,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $timestamp = $datetime->getTimestamp();

</span><span class="cx" style="display: block; padding: 0 10px">                $mysql     = $datetime->format( 'Y-m-d H:i:s' );

</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->assertEquals( $timestamp, mysql2date( 'U', $mysql, false ) );

-               $this->assertEquals( $timestamp, mysql2date( 'G', $mysql, false ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $timestamp, mysql2date( 'U', $mysql, false ) );

+               $this->assertSame( $timestamp, mysql2date( 'G', $mysql, false ) );

</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="trunktestsphpunittestsdatequeryphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/date/query.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/query.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/query.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'relation' => 'AND',

</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->assertEquals( $expected, $q->queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $q->queries );

</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_get_compare_empty() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1078,7 +1078,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->assertEquals( array( $p2 ), $q->posts );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $p2 ), $q->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">@@ -1100,7 +1100,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->assertEquals( array( $p2 ), $q->posts );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $p2 ), $q->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">@@ -1124,7 +1124,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // MySQL ignores the invalid clause.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $p1, $p2 ), $q->posts );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $p1, $p2 ), $q->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">        /** Helpers */

</span></span></pre></div>

<a id="trunktestsphpunittestsdatetheDatephp"></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/theDate.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/theDate.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/theDate.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,20 +61,20 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                ob_end_clean();

</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->assertEquals( 1, $this->hooks_called['the_time'] );

-               $this->assertEquals( 2, $this->hooks_called['get_the_time'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $this->hooks_called['the_time'] );

+               $this->assertSame( 2, $this->hooks_called['get_the_time'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $this->hooks_called['the_modified_time'] );

-               $this->assertEquals( 2, $this->hooks_called['get_the_modified_time'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $this->hooks_called['the_modified_time'] );

+               $this->assertSame( 2, $this->hooks_called['get_the_modified_time'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $this->hooks_called['the_date'] );

-               $this->assertEquals( 2, $this->hooks_called['get_the_date'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $this->hooks_called['the_date'] );

+               $this->assertSame( 2, $this->hooks_called['get_the_date'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $this->hooks_called['the_modified_date'] );

-               $this->assertEquals( 2, $this->hooks_called['get_the_modified_date'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $this->hooks_called['the_modified_date'] );

+               $this->assertSame( 2, $this->hooks_called['get_the_modified_date'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 5, $this->hooks_called['get_post_time'] );

-               $this->assertEquals( 5, $this->hooks_called['get_post_modified_time'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 5, $this->hooks_called['get_post_time'] );

+               $this->assertSame( 5, $this->hooks_called['get_post_modified_time'] );

</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 count_hook( $input ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                ob_start();

</span><span class="cx" style="display: block; padding: 0 10px">                the_date();

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = ob_get_clean();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', $actual );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['post'] = self::factory()->post->create_and_get(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,25 +102,25 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['currentday']  = '18.09.15';

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['previousday'] = '17.09.15';

</span><span class="cx" style="display: block; padding: 0 10px">                the_date();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'September 16, 2015', ob_get_clean() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'September 16, 2015', ob_get_clean() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                ob_start();

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['currentday']  = '18.09.15';

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['previousday'] = '17.09.15';

</span><span class="cx" style="display: block; padding: 0 10px">                the_date( 'Y' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '2015', ob_get_clean() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '2015', ob_get_clean() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                ob_start();

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['currentday']  = '18.09.15';

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['previousday'] = '17.09.15';

</span><span class="cx" style="display: block; padding: 0 10px">                the_date( 'Y', 'before ', ' after' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'before 2015 after', ob_get_clean() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'before 2015 after', ob_get_clean() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                ob_start();

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['currentday']  = '18.09.15';

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['previousday'] = '17.09.15';

</span><span class="cx" style="display: block; padding: 0 10px">                the_date( 'Y', 'before ', ' after', false );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', ob_get_clean() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', ob_get_clean() );

</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">@@ -130,7 +130,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                ob_start();

</span><span class="cx" style="display: block; padding: 0 10px">                the_weekday_date();

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = ob_get_clean();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', $actual );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['post'] = self::factory()->post->create_and_get(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,12 +142,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['currentday']      = '18.09.15';

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['previousweekday'] = '17.09.15';

</span><span class="cx" style="display: block; padding: 0 10px">                the_weekday_date();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Wednesday', ob_get_clean() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Wednesday', ob_get_clean() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                ob_start();

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['currentday']      = '18.09.15';

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['previousweekday'] = '17.09.15';

</span><span class="cx" style="display: block; padding: 0 10px">                the_weekday_date( 'before ', ' after' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'before Wednesday after', ob_get_clean() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'before Wednesday after', ob_get_clean() );

</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="trunktestsphpunittestsdatewpDatephp"></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/wpDate.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/wpDate.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/wpDate.php   2020-09-02 00:35:36 UTC (rev 48937)

</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">                $utc      = new DateTimeZone( 'UTC' );

</span><span class="cx" style="display: block; padding: 0 10px">                $datetime = new DateTimeImmutable( '2019-10-17', $utc );

</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->assertEquals( '10月', wp_date( 'F', $datetime->getTimestamp(), $utc ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '10月', wp_date( 'F', $datetime->getTimestamp(), $utc ) );

</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">@@ -58,6 +58,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $utc      = new DateTimeZone( 'UTC' );

</span><span class="cx" style="display: block; padding: 0 10px">                $datetime = new DateTimeImmutable( '2019-10-17', $utc );

</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->assertEquals( $string, wp_date( 'F', $datetime->getTimestamp(), $utc ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $string, wp_date( 'F', $datetime->getTimestamp(), $utc ) );

</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="trunktestsphpunittestsdatewpTimezonephp"></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/wpTimezone.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/wpTimezone.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/wpTimezone.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,11 +18,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                delete_option( 'timezone_string' );

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'gmt_offset', $gmt_offset );

</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->assertEquals( $tz_name, wp_timezone_string() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $tz_name, wp_timezone_string() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $timezone = wp_timezone();

</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->assertEquals( $tz_name, $timezone->getName() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $tz_name, $timezone->getName() );

</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">@@ -31,11 +31,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_should_return_timezone_string() {

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'timezone_string', 'Europe/Kiev' );

</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->assertEquals( 'Europe/Kiev', wp_timezone_string() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Europe/Kiev', wp_timezone_string() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $timezone = wp_timezone();

</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->assertEquals( 'Europe/Kiev', $timezone->getName() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Europe/Kiev', $timezone->getName() );

</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="trunktestsphpunittestsdatexmlrpcphp"></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/xmlrpc.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/date/xmlrpc.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/date/xmlrpc.php   2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $datetime->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $post->post_date,

</span><span class="cx" style="display: block; padding: 0 10px">                        'UTC time with explicit time zone into mw_newPost'

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $datetime->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $post->post_date,

</span><span class="cx" style="display: block; padding: 0 10px">                        'Local time w/o time zone into mw_newPost'

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $datetime->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $post->post_date,

</span><span class="cx" style="display: block; padding: 0 10px">                        'UTC time into mw_newPost'

</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">                        )

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $datetime->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $post->post_date,

</span><span class="cx" style="display: block; padding: 0 10px">                        'Local time into wp_newPost'

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $datetime->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $post->post_date,

</span><span class="cx" style="display: block; padding: 0 10px">                        'UTC time into wp_newPost'

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $fetched_post = get_post( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $datetime->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $fetched_post->post_date,

</span><span class="cx" style="display: block; padding: 0 10px">                        'Local time into mw_editPost'

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +185,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $fetched_post = get_post( $post_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $datetime->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $fetched_post->post_date,

</span><span class="cx" style="display: block; padding: 0 10px">                        'UTC time into mw_editPost'

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +231,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $fetched_comment = get_comment( $comment_id );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $datetime->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $fetched_comment->comment_date,

</span><span class="cx" style="display: block; padding: 0 10px">                        'UTC time into wp_editComment'

</span></span></pre></div>

<a id="trunktestsphpunittestsdbcharsetphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/db/charset.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db/charset.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/db/charset.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,7 +416,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $conv_utf8 = mb_convert_encoding( $big5, 'UTF-8', 'BIG-5' );

<span class="cx" style="display: block; padding: 0 10px">                        // Make sure PHP's multibyte conversions are working correctly.

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertNotEquals( $utf8, $big5 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $utf8, $conv_utf8 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $utf8, $conv_utf8 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $fields['big5'] = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'charset'  => 'big5',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,7 +647,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $value    = "H€llo\xe0\x80\x80World\xf0\xff\xff\xff¢";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'H€lloWorld¢';

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = $wpdb->strip_invalid_text_for_column( $wpdb->posts, 'post_content', $value );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -754,10 +754,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                self::$_wpdb->query( $create );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $charset = self::$_wpdb->get_table_charset( $table );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $charset, $expected_charset );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $charset, $expected_charset );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $charset = self::$_wpdb->get_table_charset( strtoupper( $table ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $charset, $expected_charset );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $charset, $expected_charset );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                self::$_wpdb->query( $drop );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -794,8 +794,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                self::$_wpdb->query( $create );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $expected_charset as $column => $charset ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $charset, self::$_wpdb->get_col_charset( $table, $column ) );

-                       $this->assertEquals( $charset, self::$_wpdb->get_col_charset( strtoupper( $table ), strtoupper( $column ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $charset, self::$_wpdb->get_col_charset( $table, $column ) );

+                       $this->assertSame( $charset, self::$_wpdb->get_col_charset( strtoupper( $table ), strtoupper( $column ) ) );

</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">                self::$_wpdb->query( $drop );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -819,7 +819,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $columns = array_keys( $columns );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $columns as $column => $charset ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( false, self::$_wpdb->get_col_charset( $table, $column ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertFalse( self::$_wpdb->get_col_charset( $table, $column ) );

</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">                self::$_wpdb->query( $drop );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -845,7 +845,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $columns = array_keys( $columns );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $columns as $column => $charset ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( false, self::$_wpdb->get_col_charset( $table, $column ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertFalse( self::$_wpdb->get_col_charset( $table, $column ) );

</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">                self::$_wpdb->query( $drop );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -901,7 +901,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                self::$_wpdb->query( $create );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $return = self::$_wpdb->strip_invalid_text_from_query( $query );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $return );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $return );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                self::$_wpdb->query( $drop );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -935,7 +935,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_dont_strip_text_from_schema_queries( $query ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $return = self::$_wpdb->strip_invalid_text_from_query( $query );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $query, $return );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $query, $return );

</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">@@ -1017,7 +1017,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                self::$_wpdb->query( $create );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $return = self::$_wpdb->check_safe_collation( $query );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $return );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $return );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $always_true as $true_query ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $return = self::$_wpdb->check_safe_collation( $true_query );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1032,11 +1032,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // TEXT column.

</span><span class="cx" style="display: block; padding: 0 10px">                $stripped = $wpdb->strip_invalid_text_for_column( $wpdb->comments, 'comment_content', str_repeat( 'A', 65536 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 65535, strlen( $stripped ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 65535, strlen( $stripped ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // VARCHAR column.

</span><span class="cx" style="display: block; padding: 0 10px">                $stripped = $wpdb->strip_invalid_text_for_column( $wpdb->comments, 'comment_agent', str_repeat( 'A', 256 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 255, strlen( $stripped ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 255, strlen( $stripped ) );

</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">@@ -1053,7 +1053,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                self::$_wpdb->query( "DROP TABLE $tablename" );

</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->assertEquals( $safe_query, $stripped_query );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $safe_query, $stripped_query );

</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">@@ -1075,7 +1075,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                self::$_wpdb->charset = $charset;

</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->assertEquals( $safe_query, $stripped_query );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $safe_query, $stripped_query );

</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">@@ -1084,11 +1084,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_set_charset_changes_the_connection_collation() {

</span><span class="cx" style="display: block; padding: 0 10px">                self::$_wpdb->set_charset( self::$_wpdb->dbh, 'utf8', 'utf8_general_ci' );

</span><span class="cx" style="display: block; padding: 0 10px">                $results = self::$_wpdb->get_results( "SHOW VARIABLES WHERE Variable_name='collation_connection'" );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'utf8_general_ci', $results[0]->Value );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'utf8_general_ci', $results[0]->Value );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                self::$_wpdb->set_charset( self::$_wpdb->dbh, 'utf8mb4', 'utf8mb4_unicode_ci' );

</span><span class="cx" style="display: block; padding: 0 10px">                $results = self::$_wpdb->get_results( "SHOW VARIABLES WHERE Variable_name='collation_connection'" );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'utf8mb4_unicode_ci', $results[0]->Value );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'utf8mb4_unicode_ci', $results[0]->Value );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                self::$_wpdb->set_charset( self::$_wpdb->dbh );

</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  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/db.php    2020-09-02 00:35:36 UTC (rev 48937)

</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">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $inputs as $key => $input ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $key ], $wpdb->esc_like( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $key ], $wpdb->esc_like( $input ) );

</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">@@ -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_like_query( $data, $like, $result ) {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $result, $wpdb->get_var( $wpdb->prepare( 'SELECT %s LIKE %s', $data, $wpdb->esc_like( $like ) ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $result, $wpdb->get_var( $wpdb->prepare( 'SELECT %s LIKE %s', $data, $wpdb->esc_like( $like ) ) ) );

</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 data_like_query() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->col_meta = $new_meta;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEquals( $col_meta, $new_meta );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $col_meta, $wpdb->col_meta );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $col_meta, $wpdb->col_meta );

</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">@@ -281,7 +281,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertContains( $wpdb->placeholder_escape(), $sql );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $sql = $wpdb->remove_placeholder_escape( $sql );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "UPDATE test_table SET string_column = '%f is a float, %d is an int 3, %s is a string', field = '4'", $sql );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "UPDATE test_table SET string_column = '%f is a float, %d is an int 3, %s is a string', field = '4'", $sql );

</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">@@ -367,7 +367,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // This, obviously, is an incorrect prepare.

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared

</span><span class="cx" style="display: block; padding: 0 10px">                $prepared = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = $id", $id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 0", $prepared );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "SELECT * FROM $wpdb->users WHERE id = 0", $prepared );

</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_prepare_sprintf() {

</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">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $prepared = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", 1, 'admin' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = 'admin'", $prepared );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = 'admin'", $prepared );

</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">@@ -385,11 +385,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged

</span><span class="cx" style="display: block; padding: 0 10px">                $prepared = @$wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", 1, array( 'admin' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = ''", $prepared );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = ''", $prepared );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged

</span><span class="cx" style="display: block; padding: 0 10px">                $prepared = @$wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", array( 1 ), 'admin' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 0 AND user_login = 'admin'", $prepared );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "SELECT * FROM $wpdb->users WHERE id = 0 AND user_login = 'admin'", $prepared );

</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_prepare_vsprintf() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,7 +396,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $prepared = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", array( 1, 'admin' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = 'admin'", $prepared );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = 'admin'", $prepared );

</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">@@ -407,11 +407,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged

</span><span class="cx" style="display: block; padding: 0 10px">                $prepared = @$wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", array( 1, array( 'admin' ) ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = ''", $prepared );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = ''", $prepared );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged

</span><span class="cx" style="display: block; padding: 0 10px">                $prepared = @$wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", array( array( 1 ), 'admin' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 0 AND user_login = 'admin'", $prepared );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "SELECT * FROM $wpdb->users WHERE id = 0 AND user_login = 'admin'", $prepared );

</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">@@ -490,7 +490,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $str    = $wpdb->get_caller();

</span><span class="cx" style="display: block; padding: 0 10px">                $calls  = explode( ', ', $str );

</span><span class="cx" style="display: block; padding: 0 10px">                $called = join( '->', array( __CLASS__, __FUNCTION__ ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $called, end( $calls ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $called, end( $calls ) );

</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_has_cap() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,11 +501,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $wpdb->has_cap( 'COLLATION' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $wpdb->has_cap( 'GROUP_CONCAT' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $wpdb->has_cap( 'SUBQUERIES' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         version_compare( $wpdb->db_version(), '5.0.7', '>=' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $wpdb->has_cap( 'set_charset' )

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         version_compare( $wpdb->db_version(), '5.0.7', '>=' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        $wpdb->has_cap( 'SET_CHARSET' )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -548,29 +548,29 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->get_results( "SELECT ID FROM $wpdb->users" );

</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->assertEquals( array( 'ID' ), $wpdb->get_col_info() );

-               $this->assertEquals( array( $wpdb->users ), $wpdb->get_col_info( 'table' ) );

-               $this->assertEquals( $wpdb->users, $wpdb->get_col_info( 'table', 0 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'ID' ), $wpdb->get_col_info() );

+               $this->assertSame( array( $wpdb->users ), $wpdb->get_col_info( 'table' ) );

+               $this->assertSame( $wpdb->users, $wpdb->get_col_info( 'table', 0 ) );

</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_query_and_delete() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px">                $rows = $wpdb->query( "INSERT INTO $wpdb->users (display_name) VALUES ('Walter Sobchak')" );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $rows );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $rows );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEmpty( $wpdb->insert_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $d_rows = $wpdb->delete( $wpdb->users, array( 'ID' => $wpdb->insert_id ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $d_rows );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $d_rows );

</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_get_row() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px">                $rows = $wpdb->query( "INSERT INTO $wpdb->users (display_name) VALUES ('Walter Sobchak')" );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $rows );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $rows );

</ins><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><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'object', $row );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Walter Sobchak', $row->display_name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Walter Sobchak', $row->display_name );

</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">@@ -667,7 +667,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_replace() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;

</span><span class="cx" style="display: block; padding: 0 10px">                $rows1 = $wpdb->insert( $wpdb->users, array( 'display_name' => 'Walter Sobchak' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $rows1 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $rows1 );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotEmpty( $wpdb->insert_id );

</span><span class="cx" style="display: block; padding: 0 10px">                $last = $wpdb->insert_id;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -678,13 +678,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'display_name' => 'Walter Replace Sobchak',

</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->assertEquals( 2, $rows2 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, $rows2 );

</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $last, $wpdb->insert_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $last, $wpdb->insert_id );

</ins><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", $last ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Walter Replace Sobchak', $row->display_name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Walter Replace Sobchak', $row->display_name );

</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">@@ -699,13 +699,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected1 = "UPDATE `{$wpdb->posts}` SET `post_name` = 'burrito' WHERE ";

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $wpdb->last_error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected1, $wpdb->last_query );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected1, $wpdb->last_query );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->update( $wpdb->posts, array( 'post_name' => 'burrito' ), array( 'post_status' => 'taco' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected2 = "UPDATE `{$wpdb->posts}` SET `post_name` = 'burrito' WHERE `post_status` = 'taco'";

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( $wpdb->last_error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected2, $wpdb->last_query );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected2, $wpdb->last_query );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $wpdb->suppress_errors( $suppress );

</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">@@ -875,7 +875,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 21212

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_table_from_query( $query, $table ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $table, self::$_wpdb->get_table_from_query( $query ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $table, self::$_wpdb->get_table_from_query( $query ) );

</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 data_get_table_from_query_false() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -917,7 +917,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 38751

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_escaped_table_from_show_query( $query, $table ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $table, self::$_wpdb->get_table_from_query( $query ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $table, self::$_wpdb->get_table_from_query( $query ) );

</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">@@ -1084,7 +1084,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $charset = self::$_wpdb->get_table_charset( 'some_table' );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'pre_get_table_charset', array( $this, 'filter_pre_get_table_charset' ), 10 );

</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->assertEquals( $charset, 'fake_charset' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $charset, 'fake_charset' );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px">        function filter_pre_get_table_charset( $charset, $table ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return 'fake_charset';

</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">                $charset = self::$_wpdb->get_col_charset( 'some_table', 'some_col' );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'pre_get_col_charset', array( $this, 'filter_pre_get_col_charset' ), 10 );

</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->assertEquals( $charset, 'fake_col_charset' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $charset, 'fake_col_charset' );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px">        function filter_pre_get_col_charset( $charset, $table, $column ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return 'fake_col_charset';

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1366,7 +1366,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:ignore WordPress.DB.PreparedSQL

</span><span class="cx" style="display: block; padding: 0 10px">                $sql = $wpdb->prepare( $sql, ...$values );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $sql );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $sql );

</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">@@ -1385,7 +1385,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:ignore WordPress.DB.PreparedSQL

</span><span class="cx" style="display: block; padding: 0 10px">                $sql = $wpdb->prepare( $sql, $values );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $sql );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $sql );

</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 data_prepare_with_placeholders() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1580,7 +1580,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = $wpdb->prepare( $sql, $values );

</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->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function data_escape_and_prepare() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1668,7 +1668,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $wpdb->query( "DROP TABLE {$wpdb->prefix}test_placeholder" );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotContains( '%s', $sql );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $value, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $value, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_esc_sql_with_unsupported_placeholder_type() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1678,7 +1678,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared

</span><span class="cx" style="display: block; padding: 0 10px">                $sql = $wpdb->prepare( " $sql %s ", '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->assertEquals( "  'foo' {$wpdb->placeholder_escape()}1\$c  'foo' ", $sql );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "  'foo' {$wpdb->placeholder_escape()}1\$c  'foo' ", $sql );

</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="trunktestsphpunittestsdbdeltaphp"></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/dbdelta.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dbdelta.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/dbdelta.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,9 +116,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        "{$wpdb->prefix}dbdelta_create_test" => "Created table {$wpdb->prefix}dbdelta_create_test",

</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->assertEquals( $expected, $updates );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $updates );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         "{$wpdb->prefix}dbdelta_create_test",

</span><span class="cx" style="display: block; padding: 0 10px">                        $wpdb->get_var(

</span><span class="cx" style="display: block; padding: 0 10px">                                $wpdb->prepare(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,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->assertEquals( array(), $updates );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), $updates );

</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">@@ -173,7 +173,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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                "{$wpdb->prefix}dbdelta_test.id"

</span><span class="cx" style="display: block; padding: 0 10px">                                        => "Changed type of {$wpdb->prefix}dbdelta_test.id from bigint{$this->bigint_display_width} to int(11)",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        "

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                "{$wpdb->prefix}dbdelta_test.extra_col"

</span><span class="cx" style="display: block; padding: 0 10px">                                        => "Added column {$wpdb->prefix}dbdelta_test.extra_col",

</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">                        "

</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->assertEquals( array(), $updates );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), $updates );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTableHasColumn( 'column_1', $wpdb->prefix . 'dbdelta_test' );

</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 class="cx" style="display: block; padding: 0 10px">                        false // Don't execute.

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                "{$wpdb->prefix}dbdelta_test.extra_col"

</span><span class="cx" style="display: block; padding: 0 10px">                                        => "Added column {$wpdb->prefix}dbdelta_test.extra_col",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        "INSERT INTO {$wpdb->prefix}dbdelta_test (column_1) VALUES ('wcphilly2015')"

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(),

</span><span class="cx" style="display: block; padding: 0 10px">                        $insert

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span></span></pre></div>

<a id="trunktestsphpunittestsdependenciesjqueryphp"></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/dependencies/jquery.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/jquery.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/dependencies/jquery.php   2020-09-02 00:35:36 UTC (rev 48937)

</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">                        $o = $scripts->query( $dep, 'registered' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertInstanceOf( '_WP_Dependency', $object );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( isset( $jquery_scripts[ $dep ] ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $jquery_scripts[ $dep ], $o->src );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $jquery_scripts[ $dep ], $o->src );

</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">@@ -40,7 +40,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $contents   = trim( file_get_contents( ABSPATH . WPINC . '/js/jquery/jquery.js' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $noconflict = 'jQuery.noConflict();';

</span><span class="cx" style="display: block; padding: 0 10px">                $end        = substr( $contents, - strlen( $noconflict ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $noconflict, $end );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $noconflict, $end );

</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="trunktestsphpunittestsdependenciesscriptsphp"></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/dependencies/scripts.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/scripts.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/dependencies/scripts.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,10 +51,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='http://example.com?ver=1.2' id='empty-deps-version-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='http://example.com' id='empty-deps-null-version-js'></script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // No scripts left to print.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', get_echo( 'wp_print_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">        /**

</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">                $ver      = get_bloginfo( 'version' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = "<script src='http://example.com?ver=$ver' id='empty-deps-no-version-js'></script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,10 +110,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='{$wp_scripts->base_url}ftp://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver' id='jquery-ftp-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Go!

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // No scripts left to print.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', get_echo( 'wp_print_scripts' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Cleanup.

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_scripts->base_url = $base_url_backup;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $ver      = get_bloginfo( 'version' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one,two,three&amp;ver={$ver}'></script>\n";

</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->assertEquals( $expected, $print_scripts );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,10 +154,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='http://example.com' id='test-only-data-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Go!

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // No scripts left to print.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,10 +172,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = "<!--[if gt IE 7]>\n<script type='text/javascript' src='http://example.com' id='test-only-conditional-js'></script>\n<![endif]-->\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Go!

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // No scripts left to print.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,10 +192,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<!--[if lt IE 9]>\n<script type='text/javascript' src='http://example.com' id='test-conditional-with-data-js'></script>\n<![endif]-->\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Go!

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // No scripts left to print.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,10 +210,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = "<script type='text/javascript' src='http://example.com' id='test-invalid-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Go!

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // No scripts left to print.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,7 +239,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'handle-three' );

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,8 +323,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected_header .= "<script type='text/javascript' src='/child-head.js' id='child-head-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected_footer  = "<script type='text/javascript' src='/parent.js' id='parent-js'></script>\n";

</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->assertEquals( $expected_header, $header );

-               $this->assertEquals( $expected_footer, $footer );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_header, $header );

+               $this->assertSame( $expected_footer, $footer );

</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">@@ -344,8 +344,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected_footer  = "<script type='text/javascript' src='/child-footer.js' id='child-footer-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected_footer .= "<script type='text/javascript' src='/parent.js' id='parent-js'></script>\n";

</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->assertEquals( $expected_header, $header );

-               $this->assertEquals( $expected_footer, $footer );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_header, $header );

+               $this->assertSame( $expected_footer, $footer );

</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">@@ -375,8 +375,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected_footer .= "<script type='text/javascript' src='/child2-footer.js' id='child2-footer-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected_footer .= "<script type='text/javascript' src='/parent-footer.js' id='parent-footer-js'></script>\n";

</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->assertEquals( $expected_header, $header );

-               $this->assertEquals( $expected_footer, $footer );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_header, $header );

+               $this->assertSame( $expected_footer, $footer );

</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">@@ -393,7 +393,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_add_inline_script_unknown_handle() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( wp_add_inline_script( 'test-invalid', 'console.log("before");', 'before' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,7 +406,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected  = "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,7 +419,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected  = "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,7 +434,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,7 +447,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,7 +460,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,7 +475,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected  = "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,7 +492,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\nconsole.log(\"after\");\n</script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,7 +509,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,7 +535,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/directory/two.js?ver={$ver}' id='two-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/directory/three.js?ver={$ver}' id='three-js'></script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,7 +559,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/directory/two.js?ver={$ver}' id='two-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/directory/three.js?ver={$ver}' id='three-js'></script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,7 +587,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' id='three-js-after'>\nconsole.log(\"after three\");\n</script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/directory/four.js?ver={$ver}' id='four-js'></script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -615,8 +615,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_add_inline_script( 'test-example', 'console.log("after");' );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_script_add_data( 'test-example', 'conditional', 'gte IE 9' );

</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->assertEquals( $expected_localized, get_echo( 'wp_print_scripts' ) );

-               $this->assertEquals( $expected, $wp_scripts->print_html );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_localized, get_echo( 'wp_print_scripts' ) );

+               $this->assertSame( $expected, $wp_scripts->print_html );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( $wp_scripts->do_concat );

</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">@@ -642,7 +642,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_print_scripts();

</span><span class="cx" style="display: block; padding: 0 10px">                $print_scripts = get_echo( '_print_scripts' );

</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->assertEquals( $expected, $print_scripts );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -670,7 +670,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_print_scripts();

</span><span class="cx" style="display: block; padding: 0 10px">                $print_scripts = get_echo( '_print_scripts' );

</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->assertEquals( $expected, $print_scripts );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -696,7 +696,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_print_scripts();

</span><span class="cx" style="display: block; padding: 0 10px">                $print_scripts = get_echo( '_print_scripts' );

</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->assertEquals( $expected, $print_scripts );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -752,7 +752,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        $print_scripts         // Printed scripts.

</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->assertEqualsIgnoreEOL( $expected, $print_scripts );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, $print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -780,7 +780,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $print_scripts .= get_echo( '_print_scripts' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $tail = substr( $print_scripts, strrpos( $print_scripts, "<script type='text/javascript' src='/customize-dependency.js' id='customize-dependency-js'>" ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_tail, $tail );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_tail, $tail );

</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">@@ -805,7 +805,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/wp-includes/js/script3.js?ver={$ver}' id='three-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/wp-includes/js/script4.js?ver={$ver}' id='four-js'></script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -829,7 +829,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/wp-includes/js/script3.js?ver={$ver}' id='three-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/wp-includes/js/script4.js?ver={$ver}' id='four-js'></script>\n";

</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->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -856,7 +856,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js' id='test-example-js'></script>\n";

</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->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -883,7 +883,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/wp-content/plugins/my-plugin/js/script.js' id='plugin-example-js'></script>\n";

</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->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, get_echo( 'wp_print_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">        /**

</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">                $expected .= "<script type='text/javascript' src='/wp-content/themes/my-theme/js/script.js' id='theme-example-js'></script>\n";

</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->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,7 +937,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/wp-admin/js/script.js' id='script-handle-js'></script>\n";

</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->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -979,7 +979,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/wp-admin/js/script.js' id='test-example-js'></script>\n";

</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->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1008,7 +1008,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js' id='test-example-js'></script>\n";

</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->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, get_echo( 'wp_print_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">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1038,7 +1038,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js' id='test-dependency-js'></script>\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<script type='text/javascript' src='/wp-includes/js/script2.js' id='test-example-js'></script>\n";

</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->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, get_echo( 'wp_print_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">        /**

</span></span></pre></div>

<a id="trunktestsphpunittestsdependenciesstylesphp"></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/dependencies/styles.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/styles.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/dependencies/styles.php   2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,10 +63,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<link rel='stylesheet' id='no-deps-null-version-css'  href='http://example.com' type='text/css' media='all' />\n";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<link rel='stylesheet' id='no-deps-null-version-print-media-css'  href='http://example.com' type='text/css' media='print' />\n";

</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->assertEquals( $expected, get_echo( 'wp_print_styles' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // No styles left to print.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', get_echo( 'wp_print_styles' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', get_echo( 'wp_print_styles' ) );

</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">@@ -83,7 +83,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $ver      = get_bloginfo( 'version' );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = "<link rel='stylesheet' id='no-deps-no-version-css'  href='http://example.com?ver=$ver' media='all' />\n";

</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->assertEquals( $expected, get_echo( 'wp_print_styles' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );

</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">@@ -122,10 +122,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected .= "<link rel='stylesheet' id='reset-css-ftp-css'  href='{$wp_styles->base_url}ftp://yui.yahooapis.com/2.8.1/build/reset/reset-min.css?ver=$ver' type='text/css' media='all' />\n";

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Go!

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // No styles left to print.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', get_echo( 'wp_print_styles' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', get_echo( 'wp_print_styles' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Cleanup.

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_styles->base_url = $base_url_backup;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,7 +151,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_add_inline_style( 'handle', $style );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // No styles left to print.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );

</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">@@ -180,7 +180,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_add_inline_style( 'handle', $style );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_print_styles();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $wp_styles->print_html );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $wp_styles->print_html );

</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">@@ -210,7 +210,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_add_inline_style( 'handle', $style2 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // No styles left to print.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );

</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">@@ -235,7 +235,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_add_inline_style( 'handle', $style );

</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->assertEquals( $expected, get_echo( 'wp_print_styles' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );

</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">@@ -250,7 +250,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_style( 'handle', 'http://example.com', array(), 1 );

</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->assertEquals( $expected, get_echo( 'wp_print_styles' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );

</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">@@ -272,7 +272,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_style_add_data( 'handle', 'conditional', 'IE' );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_add_inline_style( 'handle', 'a { color: blue; }' );

</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->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_styles' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, get_echo( 'wp_print_styles' ) );

</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">@@ -304,7 +304,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_style( 'handle-three' );

</span><span class="cx" style="display: block; padding: 0 10px">                wp_add_inline_style( 'handle-three', $style );

</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->assertEquals( $expected, get_echo( 'wp_print_styles' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );

</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="trunktestsphpunittestsdependenciesphp"></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/dependencies.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/dependencies.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,12 +76,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $dep->enqueue( 'one?arg' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $dep->query( 'one', 'queue' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $dep->query( 'two', 'queue' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'arg', $dep->args['one'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'arg', $dep->args['one'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $dep->enqueue( 'two?arg' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $dep->query( 'one', 'queue' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $dep->query( 'two', 'queue' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'arg', $dep->args['two'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'arg', $dep->args['two'] );

</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_dequeue_args() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,8 +94,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $dep->enqueue( 'two?arg' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $dep->query( 'one', 'queue' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $dep->query( 'two', 'queue' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'arg', $dep->args['one'] );

-               $this->assertEquals( 'arg', $dep->args['two'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'arg', $dep->args['one'] );

+               $this->assertSame( 'arg', $dep->args['two'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $dep->dequeue( 'one' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $dep->query( 'one', 'queue' ) );

</span></span></pre></div>

<a id="trunktestsphpunittestserrorprotectionrecoverymodecookieservicephp"></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/error-protection/recovery-mode-cookie-service.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/error-protection/recovery-mode-cookie-service.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/error-protection/recovery-mode-cookie-service.php 2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,15 +14,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $service->validate_cookie( 'gibbersih' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'invalid_format', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_format', $error->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $service->validate_cookie( base64_encode( 'test|data|format' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'invalid_format', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_format', $error->get_error_code() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $service->validate_cookie( base64_encode( 'test|data|format|to|long' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'invalid_format', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_format', $error->get_error_code() );

</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">@@ -39,7 +39,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $service->validate_cookie( $cookie );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'expired', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'expired', $error->get_error_code() );

</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">@@ -55,7 +55,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $service->validate_cookie( $cookie );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'signature_mismatch', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'signature_mismatch', $error->get_error_code() );

</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">@@ -72,7 +72,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $service->validate_cookie( $cookie );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'invalid_created_at', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_created_at', $error->get_error_code() );

</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="trunktestsphpunittestserrorprotectionrecoverymodekeyservicephp"></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/error-protection/recovery-mode-key-service.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/error-protection/recovery-mode-key-service.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/error-protection/recovery-mode-key-service.php    2020-09-02 00:35:36 UTC (rev 48937)

</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">                $error   = $service->validate_recovery_mode_key( '', 'abcd', HOUR_IN_SECONDS );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'token_not_found', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'token_not_found', $error->get_error_code() );

</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">@@ -37,7 +37,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $error   = $service->validate_recovery_mode_key( '', 'abcd', HOUR_IN_SECONDS );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'token_not_found', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'token_not_found', $error->get_error_code() );

</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">@@ -50,7 +50,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $error   = $service->validate_recovery_mode_key( 'token', 'abcd', HOUR_IN_SECONDS );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'invalid_recovery_key_format', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_recovery_key_format', $error->get_error_code() );

</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">@@ -66,7 +66,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $error   = $service->validate_recovery_mode_key( $token, 'abcd', HOUR_IN_SECONDS );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'invalid_recovery_key_format', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'invalid_recovery_key_format', $error->get_error_code() );

</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">@@ -79,7 +79,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $service->validate_recovery_mode_key( $token, '', HOUR_IN_SECONDS );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'hash_mismatch', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'hash_mismatch', $error->get_error_code() );

</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">@@ -92,7 +92,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $service->validate_recovery_mode_key( $token, 'abcd', HOUR_IN_SECONDS );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'hash_mismatch', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'hash_mismatch', $error->get_error_code() );

</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">@@ -110,7 +110,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'key_expired', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'key_expired', $error->get_error_code() );

</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">@@ -137,7 +137,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'token_not_found', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'token_not_found', $error->get_error_code() );

</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">@@ -159,7 +159,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $error = $service->validate_recovery_mode_key( $token, $key, HOUR_IN_SECONDS );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertWPError( $error );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'token_not_found', $error->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'token_not_found', $error->get_error_code() );

</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="trunktestsphpunittestsfeedatomphp"></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/feed/atom.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/feed/atom.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/feed/atom.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,21 +97,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 1, $atom );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify attributes.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://www.w3.org/2005/Atom', $atom[0]['attributes']['xmlns'] );

-               $this->assertEquals( 'http://purl.org/syndication/thread/1.0', $atom[0]['attributes']['xmlns:thr'] );

-               $this->assertEquals( site_url( '/wp-atom.php' ), $atom[0]['attributes']['xml:base'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://www.w3.org/2005/Atom', $atom[0]['attributes']['xmlns'] );

+               $this->assertSame( 'http://purl.org/syndication/thread/1.0', $atom[0]['attributes']['xmlns:thr'] );

+               $this->assertSame( site_url( '/wp-atom.php' ), $atom[0]['attributes']['xml:base'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify the <feed> element is present and contains a <title> child element.

</span><span class="cx" style="display: block; padding: 0 10px">                $title = xml_find( $xml, 'feed', 'title' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_option( 'blogname' ), $title[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_option( 'blogname' ), $title[0]['content'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify the <feed> element is present and contains a <updated> child element.

</span><span class="cx" style="display: block; padding: 0 10px">                $updated = xml_find( $xml, 'feed', 'updated' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( strtotime( get_lastpostmodified() ), strtotime( $updated[0]['content'] ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( strtotime( get_lastpostmodified() ), strtotime( $updated[0]['content'] ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify the <feed> element is present and contains a <subtitle> child element.

</span><span class="cx" style="display: block; padding: 0 10px">                $subtitle = xml_find( $xml, 'feed', 'subtitle' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_option( 'blogdescription' ), $subtitle[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_option( 'blogdescription' ), $subtitle[0]['content'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify the <feed> element is present and contains two <link> child elements.

</span><span class="cx" style="display: block; padding: 0 10px">                $link = xml_find( $xml, 'feed', 'link' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,12 +118,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 2, $link );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify the <feed> element is present and contains a <link rel="alternate"> child element.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'alternate', $link[0]['attributes']['rel'] );

-               $this->assertEquals( home_url(), $link[0]['attributes']['href'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'alternate', $link[0]['attributes']['rel'] );

+               $this->assertSame( home_url(), $link[0]['attributes']['href'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify the <feed> element is present and contains a <link rel="href"> child element.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'self', $link[1]['attributes']['rel'] );

-               $this->assertEquals( home_url( '/?feed=atom' ), $link[1]['attributes']['href'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'self', $link[1]['attributes']['rel'] );

+               $this->assertSame( home_url( '/?feed=atom' ), $link[1]['attributes']['href'] );

</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">@@ -154,31 +154,31 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        // Author.

</span><span class="cx" style="display: block; padding: 0 10px">                        $author = xml_find( $entries[ $key ]['child'], 'author', 'name' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $user   = new WP_User( $post->post_author );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $user->display_name, $author[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $user->display_name, $author[0]['content'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        // Title.

</span><span class="cx" style="display: block; padding: 0 10px">                        $title = xml_find( $entries[ $key ]['child'], 'title' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $post->post_title, $title[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $post->post_title, $title[0]['content'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Link rel="alternate".

</span><span class="cx" style="display: block; padding: 0 10px">                        $link_alts = xml_find( $entries[ $key ]['child'], 'link' );

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $link_alts as $link_alt ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( 'alternate' === $link_alt['attributes']['rel'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $this->assertEquals( get_permalink( $post ), $link_alt['attributes']['href'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $this->assertSame( get_permalink( $post ), $link_alt['attributes']['href'] );

</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">                        // ID.

</span><span class="cx" style="display: block; padding: 0 10px">                        $guid = xml_find( $entries[ $key ]['child'], 'id' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $post->guid, $id[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $post->guid, $id[0]['content'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        // Updated.

</span><span class="cx" style="display: block; padding: 0 10px">                        $updated = xml_find( $entries[ $key ]['child'], 'updated' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( strtotime( $post->post_modified_gmt ), strtotime( $updated[0]['content'] ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( strtotime( $post->post_modified_gmt ), strtotime( $updated[0]['content'] ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        // Published.

</span><span class="cx" style="display: block; padding: 0 10px">                        $published = xml_find( $entries[ $key ]['child'], 'published' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( strtotime( $post->post_date_gmt ), strtotime( $published[0]['content'] ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( strtotime( $post->post_date_gmt ), strtotime( $published[0]['content'] ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        // Category.

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( get_the_category( $post->ID ) as $term ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,7 +193,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        // Content.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $this->excerpt_only ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $content = xml_find( $entries[ $key ]['child'], 'content' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $this->assertEquals( trim( apply_filters( 'the_content', $post->post_content ) ), trim( $content[0]['content'] ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $this->assertSame( trim( apply_filters( 'the_content', $post->post_content ) ), trim( $content[0]['content'] ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Link rel="replies".

</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">                        $link_replies = xml_find( $entries[ $key ]['child'], 'link' );

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $link_replies as $link_reply ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( 'replies' === $link_reply['attributes']['rel'] && 'application/atom+xml' === $link_reply['attributes']['type'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $this->assertEquals( get_post_comments_feed_link( $post->ID, 'atom' ), $link_reply['attributes']['href'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $this->assertSame( get_post_comments_feed_link( $post->ID, 'atom' ), $link_reply['attributes']['href'] );

</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">@@ -273,9 +273,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $i     = 0;

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( (array) $links as $link ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                if ( 'enclosure' === $link['attributes']['rel'] ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $this->assertEquals( $enclosures[ $i ]['expected']['href'], $link['attributes']['href'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $this->assertSame( $enclosures[ $i ]['expected']['href'], $link['attributes']['href'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $this->assertEquals( $enclosures[ $i ]['expected']['length'], $link['attributes']['length'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $this->assertEquals( $enclosures[ $i ]['expected']['type'], $link['attributes']['type'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $this->assertSame( $enclosures[ $i ]['expected']['type'], $link['attributes']['type'] );

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $i++;

</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="trunktestsphpunittestsfeedrss2php"></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/feed/rss2.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/feed/rss2.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/feed/rss2.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,15 +106,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $rss = xml_find( $xml, 'rss' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // There should only be one <rss> child element.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, count( $rss ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $rss ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '2.0', $rss[0]['attributes']['version'] );

-               $this->assertEquals( 'http://purl.org/rss/1.0/modules/content/', $rss[0]['attributes']['xmlns:content'] );

-               $this->assertEquals( 'http://wellformedweb.org/CommentAPI/', $rss[0]['attributes']['xmlns:wfw'] );

-               $this->assertEquals( 'http://purl.org/dc/elements/1.1/', $rss[0]['attributes']['xmlns:dc'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '2.0', $rss[0]['attributes']['version'] );

+               $this->assertSame( 'http://purl.org/rss/1.0/modules/content/', $rss[0]['attributes']['xmlns:content'] );

+               $this->assertSame( 'http://wellformedweb.org/CommentAPI/', $rss[0]['attributes']['xmlns:wfw'] );

+               $this->assertSame( 'http://purl.org/dc/elements/1.1/', $rss[0]['attributes']['xmlns:dc'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // RSS should have exactly one child element (channel).

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, count( $rss[0]['child'] ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $rss[0]['child'] ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,16 +135,16 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Verify the channel is present and contains a title child element.

</span><span class="cx" style="display: block; padding: 0 10px">                $title = xml_find( $xml, 'rss', 'channel', 'title' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_option( 'blogname' ), $title[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_option( 'blogname' ), $title[0]['content'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $desc = xml_find( $xml, 'rss', 'channel', 'description' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_option( 'blogdescription' ), $desc[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_option( 'blogdescription' ), $desc[0]['content'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $link = xml_find( $xml, 'rss', 'channel', 'link' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_option( 'siteurl' ), $link[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_option( 'siteurl' ), $link[0]['content'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $pubdate = xml_find( $xml, 'rss', 'channel', 'lastBuildDate' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( strtotime( get_lastpostmodified() ), strtotime( $pubdate[0]['content'] ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( strtotime( get_lastpostmodified() ), strtotime( $pubdate[0]['content'] ) );

</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">@@ -199,24 +199,24 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        // Title.

</span><span class="cx" style="display: block; padding: 0 10px">                        $title = xml_find( $items[ $key ]['child'], 'title' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $post->post_title, $title[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $post->post_title, $title[0]['content'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        // Link.

</span><span class="cx" style="display: block; padding: 0 10px">                        $link = xml_find( $items[ $key ]['child'], 'link' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( get_permalink( $post ), $link[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( get_permalink( $post ), $link[0]['content'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Comment link.

</span><span class="cx" style="display: block; padding: 0 10px">                        $comments_link = xml_find( $items[ $key ]['child'], 'comments' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( get_permalink( $post ) . '#respond', $comments_link[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( get_permalink( $post ) . '#respond', $comments_link[0]['content'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Pub date.

</span><span class="cx" style="display: block; padding: 0 10px">                        $pubdate = xml_find( $items[ $key ]['child'], 'pubDate' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( strtotime( $post->post_date_gmt ), strtotime( $pubdate[0]['content'] ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( strtotime( $post->post_date_gmt ), strtotime( $pubdate[0]['content'] ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        // Author.

</span><span class="cx" style="display: block; padding: 0 10px">                        $creator = xml_find( $items[ $key ]['child'], 'dc:creator' );

</span><span class="cx" style="display: block; padding: 0 10px">                        $user    = new WP_User( $post->post_author );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $user->display_name, $creator[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $user->display_name, $creator[0]['content'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Categories (perhaps multiple).

</span><span class="cx" style="display: block; padding: 0 10px">                        $categories = xml_find( $items[ $key ]['child'], 'category' );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,33 +233,33 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        $cats = array_filter( $cats );

<span class="cx" style="display: block; padding: 0 10px">                        // Should be the same number of categories.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( count( $cats ), count( $categories ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( count( $cats ), count( $categories ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // ..with the same names.

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $cats as $id => $cat ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $this->assertEquals( $cat, $categories[ $id ]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $this->assertSame( $cat, $categories[ $id ]['content'] );

</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">                        // GUID.

</span><span class="cx" style="display: block; padding: 0 10px">                        $guid = xml_find( $items[ $key ]['child'], 'guid' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 'false', $guid[0]['attributes']['isPermaLink'] );

-                       $this->assertEquals( $post->guid, $guid[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 'false', $guid[0]['attributes']['isPermaLink'] );

+                       $this->assertSame( $post->guid, $guid[0]['content'] );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        // Description / Excerpt.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! empty( $post->post_excerpt ) ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $description = xml_find( $items[ $key ]['child'], 'description' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $this->assertEquals( trim( $post->post_excerpt ), trim( $description[0]['content'] ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $this->assertSame( trim( $post->post_excerpt ), trim( $description[0]['content'] ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Post content.

</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! $this->excerpt_only ) {

</span><span class="cx" style="display: block; padding: 0 10px">                                $content = xml_find( $items[ $key ]['child'], 'content:encoded' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $this->assertEquals( trim( apply_filters( 'the_content', $post->post_content ) ), trim( $content[0]['content'] ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $this->assertSame( trim( apply_filters( 'the_content', $post->post_content ) ), trim( $content[0]['content'] ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                        // Comment RSS.

</span><span class="cx" style="display: block; padding: 0 10px">                        $comment_rss = xml_find( $items[ $key ]['child'], 'wfw:commentRss' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( html_entity_decode( get_post_comments_feed_link( $post->ID ) ), $comment_rss[0]['content'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( html_entity_decode( get_post_comments_feed_link( $post->ID ) ), $comment_rss[0]['content'] );

</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">@@ -320,7 +320,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $rss = xml_find( $xml, 'rss' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // There should only be one <rss> child element.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, count( $rss ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $rss ) );

</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">@@ -348,7 +348,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $rss = xml_find( $xml, 'rss' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // There should only be one <rss> child element.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, count( $rss ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $rss ) );

</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">@@ -381,7 +381,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $rss = xml_find( $xml, 'rss' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // There should only be one <rss> child element.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, count( $rss ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $rss ) );

</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">@@ -409,7 +409,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $rss = xml_find( $xml, 'rss' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // There should only be one <rss> child element.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, count( $rss ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $rss ) );

</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">@@ -437,7 +437,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $rss = xml_find( $xml, 'rss' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // There should only be one <rss> child element.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, count( $rss ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $rss ) );

</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">@@ -465,7 +465,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $rss = xml_find( $xml, 'rss' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // There should only be one <rss> child element.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, count( $rss ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $rss ) );

</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">@@ -483,7 +483,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Get the <rss> child element of <xml>.

</span><span class="cx" style="display: block; padding: 0 10px">                $rss             = xml_find( $xml, $element );

</span><span class="cx" style="display: block; padding: 0 10px">                $last_build_date = $rss[0]['child'][0]['child'][4]['content'];

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( strtotime( get_feed_build_date( 'r' ) ), strtotime( $last_build_date ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( strtotime( get_feed_build_date( 'r' ) ), strtotime( $last_build_date ) );

</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="trunktestsphpunittestsfilephp"></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/file.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/file.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/file.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $actual as $header => $value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $header ], $value, $header );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $header ], $value, $header );

</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">@@ -61,7 +61,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">                foreach ( $actual as $header => $value ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $header ], $value, $header );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $header ], $value, $header );

</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">@@ -118,7 +118,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $filename = wp_unique_filename( $this->dir, $name . $this->badchars . '.txt' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Make sure the bad characters were all stripped out.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $name . '.txt', $filename );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $name . '.txt', $filename );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->is_unique_writable_file( $this->dir, $filename ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $filename = wp_unique_filename( $this->dir, $name . '/' . $name . '.txt' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // The slash should be removed, i.e. "foofoo.txt".

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $name . $name . '.txt', $filename );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $name . $name . '.txt', $filename );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->is_unique_writable_file( $this->dir, $filename ) );

</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">                $filename = wp_unique_filename( $this->dir, $name . '.php.txt' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // "foo.php.txt" becomes "foo.php_.txt".

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $name . '.php_.txt', $filename );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $name . '.php_.txt', $filename );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->is_unique_writable_file( $this->dir, $filename ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $name     = __FUNCTION__;

</span><span class="cx" style="display: block; padding: 0 10px">                $filename = wp_unique_filename( $this->dir, $name );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $name, $filename );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $name, $filename );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $this->is_unique_writable_file( $this->dir, $filename ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +231,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->assertWPError( $verify );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'signature_verification_failed', $verify->get_error_code() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'signature_verification_failed', $verify->get_error_code() );

</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 filter_trust_plus85Tq_key( $keys ) {

</span></span></pre></div>

<a id="trunktestsphpunittestsfilesystemfindFolderphp"></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/filesystem/findFolder.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/filesystem/findFolder.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/filesystem/findFolder.php 2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,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">                $path = $fs->find_folder( '/var/www/wordpress/' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/var/www/wordpress/', $path );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/var/www/wordpress/', $path );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $path = $fs->find_folder( '/this/directory/doesnt/exist/' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $path );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,10 +44,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $path = $fs->find_folder( '/var/www/example.com/wordpress/' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/www/example.com/wordpress/', $path );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/www/example.com/wordpress/', $path );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $path = $fs->find_folder( '/var/www/wp.example.com/wordpress/wp-content/' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/www/wp.example.com/wordpress/wp-content/', $path );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/www/wp.example.com/wordpress/wp-content/', $path );

</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">@@ -72,10 +72,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $path = $fs->abspath( '/var/www/example.com/wp.example.com/wordpress/' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/wp.example.com/wordpress/', $path );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/wp.example.com/wordpress/', $path );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $path = $fs->abspath( '/var/www/example.com/' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/', $path );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/', $path );

</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">@@ -103,15 +103,15 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // www.example.com

</span><span class="cx" style="display: block; padding: 0 10px">                $path = $fs->abspath( '/var/www/example.com/www/' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/example.com/www/', $path );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/example.com/www/', $path );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // sub.example.com

</span><span class="cx" style="display: block; padding: 0 10px">                $path = $fs->abspath( '/var/www/example.com/sub/' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/example.com/sub/', $path );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/example.com/sub/', $path );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // sub.example.com - Plugins.

</span><span class="cx" style="display: block; padding: 0 10px">                $path = $fs->find_folder( '/var/www/example.com/sub/wp-content/plugins/' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/example.com/sub/wp-content/plugins/', $path );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/example.com/sub/wp-content/plugins/', $path );

</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="trunktestsphpunittestsfiltersphp"></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/filters.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/filters.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/filters.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,16 +13,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $val = __FUNCTION__ . '_val';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a, 'filter' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, apply_filters( $tag, $val ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, apply_filters( $tag, $val ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Only one event occurred for the hook, with empty args.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a->get_call_count() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Only our hook was called.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $tag ), $a->get_tags() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $tag ), $a->get_tags() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $argsvar = $a->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $args    = array_pop( $argsvar );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $val ), $args );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $val ), $args );

</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_remove_filter() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,17 +31,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $val = __FUNCTION__ . '_val';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a, 'filter' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, apply_filters( $tag, $val ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, apply_filters( $tag, $val ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Make sure our hook was called correctly.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a->get_call_count() );

-               $this->assertEquals( array( $tag ), $a->get_tags() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a->get_call_count() );

+               $this->assertSame( array( $tag ), $a->get_tags() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Now remove the filter, do it again, and make sure it's not called this time.

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( $tag, array( $a, 'filter' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, apply_filters( $tag, $val ) );

-               $this->assertEquals( 1, $a->get_call_count() );

-               $this->assertEquals( array( $tag ), $a->get_tags() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, apply_filters( $tag, $val ) );

+               $this->assertSame( 1, $a->get_call_count() );

+               $this->assertSame( array( $tag ), $a->get_tags() );

</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">@@ -52,7 +52,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( has_filter( $tag, $func ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( has_filter( $tag ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        add_filter( $tag, $func );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( 10, has_filter( $tag, $func ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( 10, has_filter( $tag, $func ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->assertTrue( has_filter( $tag ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        remove_filter( $tag, $func );

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertFalse( has_filter( $tag, $func ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,11 +70,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a1, 'filter' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a2, 'filter' ) );

</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->assertEquals( $val, apply_filters( $tag, $val ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, apply_filters( $tag, $val ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Both filters called once each.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a1->get_call_count() );

-               $this->assertEquals( 1, $a2->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a1->get_call_count() );

+               $this->assertSame( 1, $a2->get_call_count() );

</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_filter_args_1() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,11 +85,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a, 'filter' ), 10, 2 );

<span class="cx" style="display: block; padding: 0 10px">                // Call the filter with a single argument.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, apply_filters( $tag, $val, $arg1 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, apply_filters( $tag, $val, $arg1 ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a->get_call_count() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $argsvar = $a->get_args();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $val, $arg1 ), array_pop( $argsvar ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $val, $arg1 ), array_pop( $argsvar ) );

</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_filter_args_2() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,17 +104,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a1, 'filter' ), 10, 3 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a2, 'filter' ) );

<span class="cx" style="display: block; padding: 0 10px">                // Call the filter with two arguments.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, apply_filters( $tag, $val, $arg1, $arg2 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, apply_filters( $tag, $val, $arg1, $arg2 ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // $a1 should be called with both args.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a1->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a1->get_call_count() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $argsvar1 = $a1->get_args();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $val, $arg1, $arg2 ), array_pop( $argsvar1 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $val, $arg1, $arg2 ), array_pop( $argsvar1 ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // $a2 should be called with one only.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a2->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a2->get_call_count() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $argsvar2 = $a2->get_args();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $val ), array_pop( $argsvar2 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $val ), array_pop( $argsvar2 ) );

</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_filter_priority() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,10 +125,10 @@

<span class="cx" style="display: block; padding: 0 10px">                // Make two filters with different priorities.

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a, 'filter' ), 10 );

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( $tag, array( $a, 'filter2' ), 9 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, apply_filters( $tag, $val ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, apply_filters( $tag, $val ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // There should be two events, one per filter.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 2, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, $a->get_call_count() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = array(

<span class="cx" style="display: block; padding: 0 10px">                        // 'filter2' is called first because it has priority 9.

</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">                        ),

</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->assertEquals( $expected, $a->get_events() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $a->get_events() );

</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_all_filter() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,15 +157,15 @@

<span class="cx" style="display: block; padding: 0 10px">                // Add an 'all' filter.

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'all', array( $a, 'filterall' ) );

<span class="cx" style="display: block; padding: 0 10px">                // Apply some filters.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, apply_filters( $tag1, $val ) );

-               $this->assertEquals( $val, apply_filters( $tag2, $val ) );

-               $this->assertEquals( $val, apply_filters( $tag1, $val ) );

-               $this->assertEquals( $val, apply_filters( $tag1, $val ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, apply_filters( $tag1, $val ) );

+               $this->assertSame( $val, apply_filters( $tag2, $val ) );

+               $this->assertSame( $val, apply_filters( $tag1, $val ) );

+               $this->assertSame( $val, apply_filters( $tag1, $val ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Our filter should have been called once for each apply_filters call.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 4, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 4, $a->get_call_count() );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // The right hooks should have been called in order.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( $tag1, $tag2, $tag1, $tag1 ), $a->get_tags() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $tag1, $tag2, $tag1, $tag1 ), $a->get_tags() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'all', array( $a, 'filterall' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_filter( 'all', array( $a, 'filterall' ) ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,21 +179,21 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'all', array( $a, 'filterall' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( has_filter( 'all' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 10, has_filter( 'all', array( $a, 'filterall' ) ) );

-               $this->assertEquals( $val, apply_filters( $tag, $val ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 10, has_filter( 'all', array( $a, 'filterall' ) ) );

+               $this->assertSame( $val, apply_filters( $tag, $val ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Make sure our hook was called correctly.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a->get_call_count() );

-               $this->assertEquals( array( $tag ), $a->get_tags() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a->get_call_count() );

+               $this->assertSame( array( $tag ), $a->get_tags() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Now remove the filter, do it again, and make sure it's not called this time.

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'all', array( $a, 'filterall' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_filter( 'all', array( $a, 'filterall' ) ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( has_filter( 'all' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $val, apply_filters( $tag, $val ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $val, apply_filters( $tag, $val ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Call cound should remain at 1.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, $a->get_call_count() );

-               $this->assertEquals( array( $tag ), $a->get_tags() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a->get_call_count() );

+               $this->assertSame( array( $tag ), $a->get_tags() );

</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">@@ -248,7 +248,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $result = apply_filters_ref_array( $tag, array( 'string', &$obj ) );

</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->assertEquals( $result, 'string_append_append' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $result, 'string_append_append' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $args = $a->get_args();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $args[0][1], $obj );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,7 +373,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                do_action( 'test_current_priority' );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_action( 'test_current_priority', array( $this, '_other_priority_action' ), 99 );

</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->assertSame( false, $this->current_priority );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( $this->current_priority );

</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 _other_priority_action() {

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingAutopphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/Autop.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Autop.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/Autop.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // On Windows environments, the EOL-style is \r\n.

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = str_replace( "\r\n", "\n", $expected );

</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->assertEquals( $expected, wpautop( $test_data ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wpautop( $test_data ) );

</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">@@ -77,7 +77,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Not wrapped in <p> tags.

</span><span class="cx" style="display: block; padding: 0 10px">                $str = "<pre>$code</pre>";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $str, trim( wpautop( $str ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $str, trim( wpautop( $str ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Text before/after is wrapped in  tags.

</span><span class="cx" style="display: block; padding: 0 10px">                $str = "Look at this code\n\n<pre>$code</pre>\n\nIsn't that cool?";

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,12 +84,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Expected text after wpautop().

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Look at this code</p>' . "\n<pre>" . $code . "</pre>\n" . '<p>Isn\'t that cool?</p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, trim( wpautop( $str ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, trim( wpautop( $str ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Make sure HTML breaks are maintained if manually inserted.

</span><span class="cx" style="display: block; padding: 0 10px">                $str      = "Look at this code\n\n<pre>Line1<br />Line2<br>Line3<br/>Line4\nActual Line 2\nActual Line 3</pre>\n\nCool, huh?";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = "<p>Look at this code</p>\n<pre>Line1<br />Line2<br>Line3<br/>Line4\nActual Line 2\nActual Line 3</pre>\n<p>Cool, huh?</p>";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, trim( wpautop( $str ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, trim( wpautop( $str ) ) );

</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">@@ -99,7 +99,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_skip_input_elements() {

</span><span class="cx" style="display: block; padding: 0 10px">                $str = 'Username: <input type="text" id="username" name="username" /><br />Password: <input type="password" id="password1" name="password1" />';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "<p>$str</p>", trim( wpautop( $str ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "<p>$str</p>", trim( wpautop( $str ) ) );

</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">@@ -183,9 +183,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        "[/video]</p>\n" .

</span><span class="cx" style="display: block; padding: 0 10px">                        '<p>Paragraph two.</p>';

</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->assertEquals( $expected, trim( wpautop( $content ) ) );

-               $this->assertEquals( $expected, trim( wpautop( $content2 ) ) );

-               $this->assertEquals( $shortcode_expected, trim( wpautop( $shortcode_content ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, trim( wpautop( $content ) ) );

+               $this->assertSame( $expected, trim( wpautop( $content2 ) ) );

+               $this->assertSame( $shortcode_expected, trim( wpautop( $shortcode_content ) ) );

</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">@@ -263,8 +263,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        "</object></div>\n" .

</span><span class="cx" style="display: block; padding: 0 10px">                        '<p>Paragraph two.</p>';

</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->assertEquals( $expected1, trim( wpautop( $content1 ) ) );

-               $this->assertEquals( $expected2, trim( wpautop( $content2 ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected1, trim( wpautop( $content1 ) ) );

+               $this->assertSame( $expected2, trim( wpautop( $content2 ) ) );

</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">@@ -274,7 +274,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_skip_select_option_elements() {

</span><span class="cx" style="display: block; padding: 0 10px">                $str = 'Country: <select id="state" name="state"><option value="1">Alabama</option><option value="2">Alaska</option><option value="3">Arizona</option><option value="4">Arkansas</option><option value="5">California</option></select>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "<p>$str</p>", trim( wpautop( $str ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "<p>$str</p>", trim( wpautop( $str ) ) );

</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">@@ -340,11 +340,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = join( "\n", $content );

</span><span class="cx" style="display: block; padding: 0 10px">                $input    = join( "\n\n", $content ); // Whitespace difference.

</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->assertEquals( $expected, trim( wpautop( $input ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, trim( wpautop( $input ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $input = join( '', $content ); // Whitespace difference.

</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->assertEquals( $expected, trim( wpautop( $input ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, trim( wpautop( $input ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check whitespace addition.

</span><span class="cx" style="display: block; padding: 0 10px">                $content = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -356,7 +356,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = join( "\n", $content );

</span><span class="cx" style="display: block; padding: 0 10px">                $input    = join( '', $content );

</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->assertEquals( $expected, trim( wpautop( $input ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, trim( wpautop( $input ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check whitespace addition with attributes.

</span><span class="cx" style="display: block; padding: 0 10px">                $content = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,7 +368,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = join( "\n", $content );

</span><span class="cx" style="display: block; padding: 0 10px">                $input    = join( '', $content );

</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->assertEquals( $expected, trim( wpautop( $input ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, trim( wpautop( $input ) ) );

</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">@@ -380,7 +380,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<blockquote>foo</blockquote>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<blockquote><p>foo</p></blockquote>';

</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->assertEquals( $expected, trim( wpautop( $content ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, trim( wpautop( $content ) ) );

</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">@@ -429,7 +429,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = join( "\n\n", $content );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = join( "\n", $expected );

</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->assertEquals( $expected, trim( wpautop( $content ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, trim( wpautop( $content ) ) );

</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">@@ -439,7 +439,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_element_sanity

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_element_sanity( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wpautop( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wpautop( $input ) );

</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 data_element_sanity() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,7 +505,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> line 4<br />

</span><span class="cx" style="display: block; padding: 0 10px"> line 5</p>';

</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->assertEqualsIgnoreEOL( $expected, trim( wpautop( $content ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, trim( wpautop( $content ) ) );

</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">@@ -524,7 +524,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>line 1</p>

</span><span class="cx" style="display: block; padding: 0 10px"> <p>line 2</p>';

</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->assertEqualsIgnoreEOL( $expected, trim( wpautop( $content ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, trim( wpautop( $content ) ) );

</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">@@ -535,7 +535,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = 'a<div>b</div>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = "<p>a</p>\n<div>b</div>";

</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->assertEquals( $expected, trim( wpautop( $content ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, trim( wpautop( $content ) ) );

</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">@@ -558,8 +558,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected2 = '<figure>

</span><span class="cx" style="display: block; padding: 0 10px"> <img src="example.jpg" /><figcaption>Caption</figcaption></figure>';

</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->assertEquals( $expected1, trim( wpautop( $content1 ) ) );

-               $this->assertEqualsIgnoreEOL( $expected2, trim( wpautop( $content2 ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected1, trim( wpautop( $content1 ) ) );

+               $this->assertSameIgnoreEOL( $expected2, trim( wpautop( $content2 ) ) );

</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">@@ -569,7 +569,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = 'paragraph1<hr>paragraph2';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = "<p>paragraph1</p>\n<hr>\n<p>paragraph2</p>";

</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->assertEquals( $expected, trim( wpautop( $content ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, trim( wpautop( $content ) ) );

</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">@@ -587,7 +587,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>' . $content . '</p>';

</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->assertEqualsIgnoreEOL( $expected, trim( wpautop( $content ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, trim( wpautop( $content ) ) );

</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">@@ -603,6 +603,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>' . $content . '</p>';

</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->assertEqualsIgnoreEOL( $expected, trim( wpautop( $content ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, trim( wpautop( $content ) ) );

</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="trunktestsphpunittestsformattingBlogInfophp"></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/BlogInfo.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/BlogInfo.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/BlogInfo.php   2020-09-02 00:35:36 UTC (rev 48937)

</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">                $old_locale = $locale;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $locale = $test_locale;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, get_bloginfo( 'language' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_bloginfo( 'language' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $locale = $old_locale;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,16 +54,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $sanitized_value = sanitize_option( 'blogname', $value );

</span><span class="cx" style="display: block; padding: 0 10px">                        update_option( 'blogname', $sanitized_value );

</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->assertEquals( $expected, $sanitized_value );

-                       $this->assertEquals( $expected, get_bloginfo( 'name' ) );

-                       $this->assertEquals( $expected, get_bloginfo( 'name', 'display' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected, $sanitized_value );

+                       $this->assertSame( $expected, get_bloginfo( 'name' ) );

+                       $this->assertSame( $expected, get_bloginfo( 'name', 'display' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $sanitized_value = sanitize_option( 'blogdescription', $value );

</span><span class="cx" style="display: block; padding: 0 10px">                        update_option( 'blogdescription', $sanitized_value );

</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->assertEquals( $expected, $sanitized_value );

-                       $this->assertEquals( $expected, get_bloginfo( 'description' ) );

-                       $this->assertEquals( $expected, get_bloginfo( 'description', 'display' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected, $sanitized_value );

+                       $this->assertSame( $expected, get_bloginfo( 'description' ) );

+                       $this->assertSame( $expected, get_bloginfo( 'description', 'display' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Restore old values.

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingCapitalPDangitphp"></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/CapitalPDangit.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/CapitalPDangit.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/CapitalPDangit.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,14 +7,14 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_CapitalPDangit extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function test_esc_attr_quotes() {

</span><span class="cx" style="display: block; padding: 0 10px">                global $wp_current_filter;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Something about WordPress', capital_P_dangit( 'Something about Wordpress' ) );

-               $this->assertEquals( 'Something about (WordPress', capital_P_dangit( 'Something about (Wordpress' ) );

-               $this->assertEquals( 'Something about &#8216;WordPress', capital_P_dangit( 'Something about &#8216;Wordpress' ) );

-               $this->assertEquals( 'Something about &#8220;WordPress', capital_P_dangit( 'Something about &#8220;Wordpress' ) );

-               $this->assertEquals( 'Something about >WordPress', capital_P_dangit( 'Something about >Wordpress' ) );

-               $this->assertEquals( 'Wordpress', capital_P_dangit( 'Wordpress' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Something about WordPress', capital_P_dangit( 'Something about Wordpress' ) );

+               $this->assertSame( 'Something about (WordPress', capital_P_dangit( 'Something about (Wordpress' ) );

+               $this->assertSame( 'Something about &#8216;WordPress', capital_P_dangit( 'Something about &#8216;Wordpress' ) );

+               $this->assertSame( 'Something about &#8220;WordPress', capital_P_dangit( 'Something about &#8220;Wordpress' ) );

+               $this->assertSame( 'Something about >WordPress', capital_P_dangit( 'Something about >Wordpress' ) );

+               $this->assertSame( 'Wordpress', capital_P_dangit( 'Wordpress' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_current_filter = array( 'the_title' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'WordPress', capital_P_dangit( 'Wordpress' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'WordPress', capital_P_dangit( 'Wordpress' ) );

</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="trunktestsphpunittestsformattingCleanPrephp"></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/CleanPre.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/CleanPre.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/CleanPre.php   2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,13 +13,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $source = 'a b c\n<br />sldfj<br />';

</span><span class="cx" style="display: block; padding: 0 10px">                $res    = 'a b c\nsldfj';

</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->assertEquals( $res, clean_pre( $source ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $res, clean_pre( $source ) );

</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_removes_self_closing_br_without_space() {

</span><span class="cx" style="display: block; padding: 0 10px">                $source = 'a b c\n<br/>sldfj<br/>';

</span><span class="cx" style="display: block; padding: 0 10px">                $res    = 'a b c\nsldfj';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $res, clean_pre( $source ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $res, clean_pre( $source ) );

</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">        // I don't think this can ever happen in production;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,12 +29,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_removes_html_br() {

</span><span class="cx" style="display: block; padding: 0 10px">                $source = 'a b c\n<br>sldfj<br>';

</span><span class="cx" style="display: block; padding: 0 10px">                $res    = 'a b c\nsldfj';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $res, clean_pre( $source ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $res, clean_pre( $source ) );

</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_removes_p() {

</span><span class="cx" style="display: block; padding: 0 10px">                $source = "<p>isn't this exciting!</p><p>oh indeed!</p>";

</span><span class="cx" style="display: block; padding: 0 10px">                $res    = "\nisn't this exciting!\noh indeed!";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $res, clean_pre( $source ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $res, clean_pre( $source ) );

</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="trunktestsphpunittestsformattingConvertInvalidEntriesphp"></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/ConvertInvalidEntries.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/ConvertInvalidEntries.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/ConvertInvalidEntries.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_replaces_windows1252_entities_with_unicode_ones() {

</span><span class="cx" style="display: block; padding: 0 10px">                $input  = '&#130;&#131;&#132;&#133;&#134;&#135;&#136;&#137;&#138;&#139;&#140;&#145;&#146;&#147;&#148;&#149;&#150;&#151;&#152;&#153;&#154;&#155;&#156;&#159;';

</span><span class="cx" style="display: block; padding: 0 10px">                $output = '&#8218;&#402;&#8222;&#8230;&#8224;&#8225;&#710;&#8240;&#352;&#8249;&#338;&#8216;&#8217;&#8220;&#8221;&#8226;&#8211;&#8212;&#732;&#8482;&#353;&#8250;&#339;&#376;';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $output, convert_invalid_entities( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $output, convert_invalid_entities( $input ) );

</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">@@ -16,10 +16,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_replaces_latin_letter_z_with_caron() {

</span><span class="cx" style="display: block; padding: 0 10px">                $input  = '&#142;&#158;';

</span><span class="cx" style="display: block; padding: 0 10px">                $output = '&#381;&#382;';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $output, convert_invalid_entities( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $output, convert_invalid_entities( $input ) );

</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_escapes_lone_ampersands() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'at&#038;t', convert_chars( 'at&t' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'at&#038;t', convert_chars( 'at&t' ) );

</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="trunktestsphpunittestsformattingEscAttrphp"></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/EscAttr.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/EscAttr.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/EscAttr.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,27 +6,27 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_EscAttr extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function test_esc_attr_quotes() {

</span><span class="cx" style="display: block; padding: 0 10px">                $attr = '"double quotes"';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&quot;double quotes&quot;', esc_attr( $attr ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&quot;double quotes&quot;', esc_attr( $attr ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $attr = "'single quotes'";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&#039;single quotes&#039;', esc_attr( $attr ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&#039;single quotes&#039;', esc_attr( $attr ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $attr = "'mixed' " . '"quotes"';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&#039;mixed&#039; &quot;quotes&quot;', esc_attr( $attr ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&#039;mixed&#039; &quot;quotes&quot;', esc_attr( $attr ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Handles double encoding?

</span><span class="cx" style="display: block; padding: 0 10px">                $attr = '"double quotes"';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&quot;double quotes&quot;', esc_attr( esc_attr( $attr ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&quot;double quotes&quot;', esc_attr( esc_attr( $attr ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $attr = "'single quotes'";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&#039;single quotes&#039;', esc_attr( esc_attr( $attr ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&#039;single quotes&#039;', esc_attr( esc_attr( $attr ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $attr = "'mixed' " . '"quotes"';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&#039;mixed&#039; &quot;quotes&quot;', esc_attr( esc_attr( $attr ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&#039;mixed&#039; &quot;quotes&quot;', esc_attr( esc_attr( $attr ) ) );

</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_esc_attr_amp() {

</span><span class="cx" style="display: block; padding: 0 10px">                $out = esc_attr( 'foo & bar &baz; &nbsp;' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foo &amp; bar &amp;baz; &nbsp;', $out );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foo &amp; bar &amp;baz; &nbsp;', $out );

</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="trunktestsphpunittestsformattingEscHtmlphp"></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/EscHtml.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/EscHtml.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/EscHtml.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,34 +7,34 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_esc_html_basics() {

<span class="cx" style="display: block; padding: 0 10px">                // Simple string.

</span><span class="cx" style="display: block; padding: 0 10px">                $html = 'The quick brown fox.';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $html, esc_html( $html ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $html, esc_html( $html ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // URL with &.

</span><span class="cx" style="display: block; padding: 0 10px">                $html    = 'http://localhost/trunk/wp-login.php?action=logout&_wpnonce=cd57d75985';

</span><span class="cx" style="display: block; padding: 0 10px">                $escaped = 'http://localhost/trunk/wp-login.php?action=logout&amp;_wpnonce=cd57d75985';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $escaped, esc_html( $html ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $escaped, esc_html( $html ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // SQL query.

</span><span class="cx" style="display: block; padding: 0 10px">                $html    = "SELECT meta_key, meta_value FROM wp_trunk_sitemeta WHERE meta_key IN ('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled') AND site_id = 1";

</span><span class="cx" style="display: block; padding: 0 10px">                $escaped = 'SELECT meta_key, meta_value FROM wp_trunk_sitemeta WHERE meta_key IN (&#039;site_name&#039;, &#039;siteurl&#039;, &#039;active_sitewide_plugins&#039;, &#039;_site_transient_timeout_theme_roots&#039;, &#039;_site_transient_theme_roots&#039;, &#039;site_admins&#039;, &#039;can_compress_scripts&#039;, &#039;global_terms_enabled&#039;) AND site_id = 1';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $escaped, esc_html( $html ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $escaped, esc_html( $html ) );

</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_escapes_ampersands() {

</span><span class="cx" style="display: block; padding: 0 10px">                $source = 'penn & teller & at&t';

</span><span class="cx" style="display: block; padding: 0 10px">                $res    = 'penn &amp; teller &amp; at&amp;t';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $res, esc_html( $source ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $res, esc_html( $source ) );

</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_escapes_greater_and_less_than() {

</span><span class="cx" style="display: block; padding: 0 10px">                $source = 'this > that < that <randomhtml />';

</span><span class="cx" style="display: block; padding: 0 10px">                $res    = 'this &gt; that &lt; that &lt;randomhtml /&gt;';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $res, esc_html( $source ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $res, esc_html( $source ) );

</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_ignores_existing_entities() {

</span><span class="cx" style="display: block; padding: 0 10px">                $source = '&#038; &#x00A3; &#x22; &amp;';

</span><span class="cx" style="display: block; padding: 0 10px">                $res    = '&#038; &#xA3; &#x22; &amp;';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $res, esc_html( $source ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $res, esc_html( $source ) );

</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="trunktestsphpunittestsformattingEscTextareaphp"></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/EscTextarea.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/EscTextarea.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/EscTextarea.php        2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_esc_textarea_charset_iso_8859_1() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'pre_option_blog_charset', array( $this, '_charset_iso_8859_1' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $iso8859_1 = 'Fran' . chr( 135 ) . 'ais';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $iso8859_1, esc_textarea( $iso8859_1 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $iso8859_1, esc_textarea( $iso8859_1 ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'pre_option_blog_charset', array( $this, '_charset_iso_8859_1' ) );

</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">@@ -30,7 +30,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_esc_textarea_charset_utf_8() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'pre_option_blog_charset', array( $this, '_charset_utf_8' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $utf8 = 'Fran' . chr( 195 ) . chr( 167 ) . 'ais';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $utf8, esc_textarea( $utf8 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $utf8, esc_textarea( $utf8 ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'pre_option_blog_charset', array( $this, '_charset_utf_8' ) );

</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="trunktestsphpunittestsformattingEscUrlphp"></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/EscUrl.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/EscUrl.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/EscUrl.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,41 +9,41 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 23605

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_spaces() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com/Mr%20WordPress', esc_url( 'http://example.com/Mr WordPress' ) );

-               $this->assertEquals( 'http://example.com/Mr%20WordPress', esc_url( 'http://example.com/Mr%20WordPress' ) );

-               $this->assertEquals( 'http://example.com/Mr%20%20WordPress', esc_url( 'http://example.com/Mr%20%20WordPress' ) );

-               $this->assertEquals( 'http://example.com/Mr+WordPress', esc_url( 'http://example.com/Mr+WordPress' ) );

-               $this->assertEquals( 'http://example.com/Mr+WordPress', esc_url( ' http://example.com/Mr+WordPress' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com/Mr%20WordPress', esc_url( 'http://example.com/Mr WordPress' ) );

+               $this->assertSame( 'http://example.com/Mr%20WordPress', esc_url( 'http://example.com/Mr%20WordPress' ) );

+               $this->assertSame( 'http://example.com/Mr%20%20WordPress', esc_url( 'http://example.com/Mr%20%20WordPress' ) );

+               $this->assertSame( 'http://example.com/Mr+WordPress', esc_url( 'http://example.com/Mr+WordPress' ) );

+               $this->assertSame( 'http://example.com/Mr+WordPress', esc_url( ' http://example.com/Mr+WordPress' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com/?foo=one%20two%20three&#038;bar=four', esc_url( 'http://example.com/?foo=one two three&bar=four' ) );

-               $this->assertEquals( 'http://example.com/?foo=one%20two%20three&#038;bar=four', esc_url( 'http://example.com/?foo=one%20two%20three&bar=four' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com/?foo=one%20two%20three&#038;bar=four', esc_url( 'http://example.com/?foo=one two three&bar=four' ) );

+               $this->assertSame( 'http://example.com/?foo=one%20two%20three&#038;bar=four', esc_url( 'http://example.com/?foo=one%20two%20three&bar=four' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_bad_characters() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com/watchthelinefeedgo', esc_url( 'http://example.com/watchthelinefeed%0Ago' ) );

-               $this->assertEquals( 'http://example.com/watchthelinefeedgo', esc_url( 'http://example.com/watchthelinefeed%0ago' ) );

-               $this->assertEquals( 'http://example.com/watchthecarriagereturngo', esc_url( 'http://example.com/watchthecarriagereturn%0Dgo' ) );

-               $this->assertEquals( 'http://example.com/watchthecarriagereturngo', esc_url( 'http://example.com/watchthecarriagereturn%0dgo' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com/watchthelinefeedgo', esc_url( 'http://example.com/watchthelinefeed%0Ago' ) );

+               $this->assertSame( 'http://example.com/watchthelinefeedgo', esc_url( 'http://example.com/watchthelinefeed%0ago' ) );

+               $this->assertSame( 'http://example.com/watchthecarriagereturngo', esc_url( 'http://example.com/watchthecarriagereturn%0Dgo' ) );

+               $this->assertSame( 'http://example.com/watchthecarriagereturngo', esc_url( 'http://example.com/watchthecarriagereturn%0dgo' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Nesting checks.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com/watchthecarriagereturngo', esc_url( 'http://example.com/watchthecarriagereturn%0%0ddgo' ) );

-               $this->assertEquals( 'http://example.com/watchthecarriagereturngo', esc_url( 'http://example.com/watchthecarriagereturn%0%0DDgo' ) );

-               $this->assertEquals( 'http://example.com/', esc_url( 'http://example.com/%0%0%0DAD' ) );

-               $this->assertEquals( 'http://example.com/', esc_url( 'http://example.com/%0%0%0ADA' ) );

-               $this->assertEquals( 'http://example.com/', esc_url( 'http://example.com/%0%0%0DAd' ) );

-               $this->assertEquals( 'http://example.com/', esc_url( 'http://example.com/%0%0%0ADa' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com/watchthecarriagereturngo', esc_url( 'http://example.com/watchthecarriagereturn%0%0ddgo' ) );

+               $this->assertSame( 'http://example.com/watchthecarriagereturngo', esc_url( 'http://example.com/watchthecarriagereturn%0%0DDgo' ) );

+               $this->assertSame( 'http://example.com/', esc_url( 'http://example.com/%0%0%0DAD' ) );

+               $this->assertSame( 'http://example.com/', esc_url( 'http://example.com/%0%0%0ADA' ) );

+               $this->assertSame( 'http://example.com/', esc_url( 'http://example.com/%0%0%0DAd' ) );

+               $this->assertSame( 'http://example.com/', esc_url( 'http://example.com/%0%0%0ADa' ) );

</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_relative() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/example.php', esc_url( '/example.php' ) );

-               $this->assertEquals( 'example.php', esc_url( 'example.php' ) );

-               $this->assertEquals( '#fragment', esc_url( '#fragment' ) );

-               $this->assertEquals( '?foo=bar', esc_url( '?foo=bar' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/example.php', esc_url( '/example.php' ) );

+               $this->assertSame( 'example.php', esc_url( 'example.php' ) );

+               $this->assertSame( '#fragment', esc_url( '#fragment' ) );

+               $this->assertSame( '?foo=bar', esc_url( '?foo=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">        function test_all_url_parts() {

</span><span class="cx" style="display: block; padding: 0 10px">                $url = 'https://user:pass@host.example.com:1234/path;p=1?query=2&r[]=3#fragment';

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'scheme'   => 'https',

</span><span class="cx" style="display: block; padding: 0 10px">                                'host'     => 'host.example.com',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,35 +56,35 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        parse_url( $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->assertEquals( 'https://user:pass@host.example.com:1234/path;p=1?query=2&r%5B%5D=3#fragment', esc_url_raw( $url ) );

-               $this->assertEquals( 'https://user:pass@host.example.com:1234/path;p=1?query=2&#038;r%5B%5D=3#fragment', esc_url( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'https://user:pass@host.example.com:1234/path;p=1?query=2&r%5B%5D=3#fragment', esc_url_raw( $url ) );

+               $this->assertSame( 'https://user:pass@host.example.com:1234/path;p=1?query=2&#038;r%5B%5D=3#fragment', esc_url( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_bare() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com?foo', esc_url( 'example.com?foo' ) );

-               $this->assertEquals( 'http://example.com', esc_url( 'example.com' ) );

-               $this->assertEquals( 'http://localhost', esc_url( 'localhost' ) );

-               $this->assertEquals( 'http://example.com/foo', esc_url( 'example.com/foo' ) );

-               $this->assertEquals( 'http://баба.org/баба', esc_url( 'баба.org/баба' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com?foo', esc_url( 'example.com?foo' ) );

+               $this->assertSame( 'http://example.com', esc_url( 'example.com' ) );

+               $this->assertSame( 'http://localhost', esc_url( 'localhost' ) );

+               $this->assertSame( 'http://example.com/foo', esc_url( 'example.com/foo' ) );

+               $this->assertSame( 'http://баба.org/баба', esc_url( 'баба.org/баба' ) );

</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_encoding() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com?foo=1&bar=2', esc_url_raw( 'http://example.com?foo=1&bar=2' ) );

-               $this->assertEquals( 'http://example.com?foo=1&amp;bar=2', esc_url_raw( 'http://example.com?foo=1&amp;bar=2' ) );

-               $this->assertEquals( 'http://example.com?foo=1&#038;bar=2', esc_url_raw( 'http://example.com?foo=1&#038;bar=2' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com?foo=1&bar=2', esc_url_raw( 'http://example.com?foo=1&bar=2' ) );

+               $this->assertSame( 'http://example.com?foo=1&amp;bar=2', esc_url_raw( 'http://example.com?foo=1&amp;bar=2' ) );

+               $this->assertSame( 'http://example.com?foo=1&#038;bar=2', esc_url_raw( 'http://example.com?foo=1&#038;bar=2' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com?foo=1&#038;bar=2', esc_url( 'http://example.com?foo=1&bar=2' ) );

-               $this->assertEquals( 'http://example.com?foo=1&#038;bar=2', esc_url( 'http://example.com?foo=1&amp;bar=2' ) );

-               $this->assertEquals( 'http://example.com?foo=1&#038;bar=2', esc_url( 'http://example.com?foo=1&#038;bar=2' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com?foo=1&#038;bar=2', esc_url( 'http://example.com?foo=1&bar=2' ) );

+               $this->assertSame( 'http://example.com?foo=1&#038;bar=2', esc_url( 'http://example.com?foo=1&amp;bar=2' ) );

+               $this->assertSame( 'http://example.com?foo=1&#038;bar=2', esc_url( 'http://example.com?foo=1&#038;bar=2' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $param = urlencode( 'http://example.com/?one=1&two=2' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "http://example.com?url={$param}", esc_url( "http://example.com?url={$param}" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "http://example.com?url={$param}", esc_url( "http://example.com?url={$param}" ) );

</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_protocol() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com', esc_url( 'http://example.com' ) );

-               $this->assertEquals( '', esc_url( 'nasty://example.com/' ) );

-               $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com', esc_url( 'http://example.com' ) );

+               $this->assertSame( '', esc_url( 'nasty://example.com/' ) );

+               $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         '',

</span><span class="cx" style="display: block; padding: 0 10px">                        esc_url(

</span><span class="cx" style="display: block; padding: 0 10px">                                'example.com',

</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">                                )

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         '',

</span><span class="cx" style="display: block; padding: 0 10px">                        esc_url(

</span><span class="cx" style="display: block; padding: 0 10px">                                'http://example.com',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                )

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         'https://example.com',

</span><span class="cx" style="display: block; padding: 0 10px">                        esc_url(

</span><span class="cx" style="display: block; padding: 0 10px">                                'https://example.com',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,8 +114,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">                foreach ( wp_allowed_protocols() as $scheme ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( "{$scheme}://example.com", esc_url( "{$scheme}://example.com" ), $scheme );

-                       $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( "{$scheme}://example.com", esc_url( "{$scheme}://example.com" ), $scheme );

+                       $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "{$scheme}://example.com",

</span><span class="cx" style="display: block; padding: 0 10px">                                esc_url(

</span><span class="cx" style="display: block; padding: 0 10px">                                        "{$scheme}://example.com",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,10 +128,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( ! in_array( 'data', wp_allowed_protocols(), true ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', esc_url( 'data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', esc_url( 'data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( ! in_array( 'foo', wp_allowed_protocols(), true ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         'foo://example.com',

</span><span class="cx" style="display: block; padding: 0 10px">                        esc_url(

</span><span class="cx" style="display: block; padding: 0 10px">                                'foo://example.com',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,27 +147,27 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 23187

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_protocol_case() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com', esc_url( 'HTTP://example.com' ) );

-               $this->assertEquals( 'http://example.com', esc_url( 'Http://example.com' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com', esc_url( 'HTTP://example.com' ) );

+               $this->assertSame( 'http://example.com', esc_url( 'Http://example.com' ) );

</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_display_extras() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com/&#039;quoted&#039;', esc_url( 'http://example.com/\'quoted\'' ) );

-               $this->assertEquals( 'http://example.com/\'quoted\'', esc_url( 'http://example.com/\'quoted\'', null, 'notdisplay' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com/&#039;quoted&#039;', esc_url( 'http://example.com/\'quoted\'' ) );

+               $this->assertSame( 'http://example.com/\'quoted\'', esc_url( 'http://example.com/\'quoted\'', null, 'notdisplay' ) );

</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_non_ascii() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.org/баба', esc_url( 'http://example.org/баба' ) );

-               $this->assertEquals( 'http://баба.org/баба', esc_url( 'http://баба.org/баба' ) );

-               $this->assertEquals( 'http://müller.com/', esc_url( 'http://müller.com/' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.org/баба', esc_url( 'http://example.org/баба' ) );

+               $this->assertSame( 'http://баба.org/баба', esc_url( 'http://баба.org/баба' ) );

+               $this->assertSame( 'http://müller.com/', esc_url( 'http://müller.com/' ) );

</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_feed() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', esc_url( 'feed:javascript:alert(1)' ) );

-               $this->assertEquals( '', esc_url( 'feed:javascript:feed:alert(1)' ) );

-               $this->assertEquals( '', esc_url( 'feed:feed:javascript:alert(1)' ) );

-               $this->assertEquals( 'feed:feed:alert(1)', esc_url( 'feed:feed:alert(1)' ) );

-               $this->assertEquals( 'feed:http://wordpress.org/feed/', esc_url( 'feed:http://wordpress.org/feed/' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', esc_url( 'feed:javascript:alert(1)' ) );

+               $this->assertSame( '', esc_url( 'feed:javascript:feed:alert(1)' ) );

+               $this->assertSame( '', esc_url( 'feed:feed:javascript:alert(1)' ) );

+               $this->assertSame( 'feed:feed:alert(1)', esc_url( 'feed:feed:alert(1)' ) );

+               $this->assertSame( 'feed:http://wordpress.org/feed/', esc_url( 'feed:http://wordpress.org/feed/' ) );

</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">@@ -174,15 +174,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16859

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_square_brackets() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/example.php?one%5B%5D=two', esc_url( '/example.php?one[]=two' ) );

-               $this->assertEquals( '?foo%5Bbar%5D=baz', esc_url( '?foo[bar]=baz' ) );

-               $this->assertEquals( '//example.com/?foo%5Bbar%5D=baz', esc_url( '//example.com/?foo[bar]=baz' ) );

-               $this->assertEquals( 'http://example.com/?foo%5Bbar%5D=baz', esc_url( 'example.com/?foo[bar]=baz' ) );

-               $this->assertEquals( 'http://localhost?foo%5Bbar%5D=baz', esc_url( 'localhost?foo[bar]=baz' ) );

-               $this->assertEquals( 'http://example.com/?foo%5Bbar%5D=baz', esc_url( 'http://example.com/?foo[bar]=baz' ) );

-               $this->assertEquals( 'http://example.com/?foo%5Bbar%5D=baz', esc_url( 'http://example.com/?foo%5Bbar%5D=baz' ) );

-               $this->assertEquals( 'http://example.com/?baz=bar&#038;foo%5Bbar%5D=baz', esc_url( 'http://example.com/?baz=bar&foo[bar]=baz' ) );

-               $this->assertEquals( 'http://example.com/?baz=bar&#038;foo%5Bbar%5D=baz', esc_url( 'http://example.com/?baz=bar&#038;foo%5Bbar%5D=baz' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/example.php?one%5B%5D=two', esc_url( '/example.php?one[]=two' ) );

+               $this->assertSame( '?foo%5Bbar%5D=baz', esc_url( '?foo[bar]=baz' ) );

+               $this->assertSame( '//example.com/?foo%5Bbar%5D=baz', esc_url( '//example.com/?foo[bar]=baz' ) );

+               $this->assertSame( 'http://example.com/?foo%5Bbar%5D=baz', esc_url( 'example.com/?foo[bar]=baz' ) );

+               $this->assertSame( 'http://localhost?foo%5Bbar%5D=baz', esc_url( 'localhost?foo[bar]=baz' ) );

+               $this->assertSame( 'http://example.com/?foo%5Bbar%5D=baz', esc_url( 'http://example.com/?foo[bar]=baz' ) );

+               $this->assertSame( 'http://example.com/?foo%5Bbar%5D=baz', esc_url( 'http://example.com/?foo%5Bbar%5D=baz' ) );

+               $this->assertSame( 'http://example.com/?baz=bar&#038;foo%5Bbar%5D=baz', esc_url( 'http://example.com/?baz=bar&foo[bar]=baz' ) );

+               $this->assertSame( 'http://example.com/?baz=bar&#038;foo%5Bbar%5D=baz', esc_url( 'http://example.com/?baz=bar&#038;foo%5Bbar%5D=baz' ) );

</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">@@ -190,7 +190,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_reserved_characters() {

</span><span class="cx" style="display: block; padding: 0 10px">                $url = "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$%27()*+,;=/?:@-._~!$%27()*+,;==#/?:@-._~!$&'()*+,;=";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $url, esc_url_raw( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $url, esc_url_raw( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +197,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 21974

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_protocol_relative_with_colon() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '//example.com/foo?foo=abc:def', esc_url( '//example.com/foo?foo=abc:def' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '//example.com/foo?foo=abc:def', esc_url( '//example.com/foo?foo=abc:def' ) );

</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">@@ -212,7 +212,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $body       = str_replace( "\r\n", "\n", $body );

</span><span class="cx" style="display: block; padding: 0 10px">                $email_link = 'mailto:?body=' . rawurlencode( $body );

</span><span class="cx" style="display: block; padding: 0 10px">                $email_link = esc_url( $email_link );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'mailto:?body=Hi%20there%2C%0A%0AI%20thought%20you%20might%20want%20to%20sign%20up%20for%20this%20newsletter', $email_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'mailto:?body=Hi%20there%2C%0A%0AI%20thought%20you%20might%20want%20to%20sign%20up%20for%20this%20newsletter', $email_link );

</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">@@ -227,7 +227,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $body       = str_replace( "\r\n", "\n", $body );

</span><span class="cx" style="display: block; padding: 0 10px">                $email_link = 'http://example.com/mailto:?body=' . rawurlencode( $body );

</span><span class="cx" style="display: block; padding: 0 10px">                $email_link = esc_url( $email_link );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com/mailto:?body=Hi%20there%2CI%20thought%20you%20might%20want%20to%20sign%20up%20for%20this%20newsletter', $email_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com/mailto:?body=Hi%20there%2CI%20thought%20you%20might%20want%20to%20sign%20up%20for%20this%20newsletter', $email_link );

</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">@@ -238,7 +238,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $email_link = 'mailto:?body=' . $body;

</span><span class="cx" style="display: block; padding: 0 10px">                $email_link = esc_url( $email_link );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'mailto:?body=Hi%20there,%20I%20thought%20you%20might%20want%20to%20sign%20up%20for%20this%20newsletter', $email_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'mailto:?body=Hi%20there,%20I%20thought%20you%20might%20want%20to%20sign%20up%20for%20this%20newsletter', $email_link );

</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">@@ -252,14 +252,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 34202

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_ipv6_hosts() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '//[::127.0.0.1]', esc_url( '//[::127.0.0.1]' ) );

-               $this->assertEquals( 'http://[::FFFF::127.0.0.1]', esc_url( 'http://[::FFFF::127.0.0.1]' ) );

-               $this->assertEquals( 'http://[::127.0.0.1]', esc_url( 'http://[::127.0.0.1]' ) );

-               $this->assertEquals( 'http://[::DEAD:BEEF:DEAD:BEEF:DEAD:BEEF:DEAD:BEEF]', esc_url( 'http://[::DEAD:BEEF:DEAD:BEEF:DEAD:BEEF:DEAD:BEEF]' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '//[::127.0.0.1]', esc_url( '//[::127.0.0.1]' ) );

+               $this->assertSame( 'http://[::FFFF::127.0.0.1]', esc_url( 'http://[::FFFF::127.0.0.1]' ) );

+               $this->assertSame( 'http://[::127.0.0.1]', esc_url( 'http://[::127.0.0.1]' ) );

+               $this->assertSame( 'http://[::DEAD:BEEF:DEAD:BEEF:DEAD:BEEF:DEAD:BEEF]', esc_url( 'http://[::DEAD:BEEF:DEAD:BEEF:DEAD:BEEF:DEAD:BEEF]' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // IPv6 with square brackets in the query? Why not.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '//[::FFFF::127.0.0.1]/?foo%5Bbar%5D=baz', esc_url( '//[::FFFF::127.0.0.1]/?foo[bar]=baz' ) );

-               $this->assertEquals( 'http://[::FFFF::127.0.0.1]/?foo%5Bbar%5D=baz', esc_url( 'http://[::FFFF::127.0.0.1]/?foo[bar]=baz' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '//[::FFFF::127.0.0.1]/?foo%5Bbar%5D=baz', esc_url( '//[::FFFF::127.0.0.1]/?foo[bar]=baz' ) );

+               $this->assertSame( 'http://[::FFFF::127.0.0.1]/?foo%5Bbar%5D=baz', esc_url( 'http://[::FFFF::127.0.0.1]/?foo[bar]=baz' ) );

</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="trunktestsphpunittestsformattingEscXmlphp"></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/EscXml.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/EscXml.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/EscXml.php     2020-09-02 00:35:36 UTC (rev 48937)

</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">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_esc_xml_basics( $source, $expected ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = esc_xml( $source );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $source   = 'penn & teller & at&t';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'penn &amp; teller &amp; at&amp;t';

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = esc_xml( $source );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_escapes_greater_and_less_than() {

</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">                $source   = 'this > that < that <randomhtml />';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'this &gt; that &lt; that &lt;randomhtml /&gt;';

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = esc_xml( $source );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_escapes_html_named_entities() {

</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">                $source   = 'this &amp; is a &hellip; followed by &rsaquo; and more and a &nonexistent; entity';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'this &amp; is a … followed by › and more and a &amp;nonexistent; entity';

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = esc_xml( $source );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_ignores_existing_entities() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // note that _wp_specialchars() strips leading 0's from numeric character references.

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '&#038; &#xA3; &#x22; &amp;';

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = esc_xml( $source );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_ignores_cdata_sections( $source, $expected ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = esc_xml( $source );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingExcerptRemoveBlocksphp"></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/ExcerptRemoveBlocks.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/ExcerptRemoveBlocks.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/ExcerptRemoveBlocks.php        2020-09-02 00:35:36 UTC (rev 48937)

</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->assertEmpty( excerpt_remove_blocks( $content ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Dynamic block with options, embedded in other content.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->filtered_content, excerpt_remove_blocks( $this->content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->filtered_content, excerpt_remove_blocks( $this->content ) );

</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="trunktestsphpunittestsformattingGetUrlInContentphp"></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/GetUrlInContent.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/GetUrlInContent.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/GetUrlInContent.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,6 +45,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider get_input_output

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_url_in_content( $in_str, $exp_str ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $exp_str, get_url_in_content( $in_str ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $exp_str, get_url_in_content( $in_str ) );

</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="trunktestsphpunittestsformattingHtmlExcerptphp"></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/HtmlExcerpt.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/HtmlExcerpt.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/HtmlExcerpt.php        2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,15 +5,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_HtmlExcerpt extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function test_simple() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Baba', wp_html_excerpt( 'Baba told me not to come', 4 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Baba', wp_html_excerpt( 'Baba told me not to come', 4 ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px">        function test_html() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Baba', wp_html_excerpt( "<a href='http://baba.net/'>Baba</a> told me not to come", 4 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Baba', wp_html_excerpt( "<a href='http://baba.net/'>Baba</a> told me not to come", 4 ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px">        function test_entities() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Baba', wp_html_excerpt( 'Baba &amp; Dyado', 8 ) );

-               $this->assertEquals( 'Baba', wp_html_excerpt( 'Baba &#038; Dyado', 8 ) );

-               $this->assertEquals( 'Baba &amp; D', wp_html_excerpt( 'Baba &amp; Dyado', 12 ) );

-               $this->assertEquals( 'Baba &amp; Dyado', wp_html_excerpt( 'Baba &amp; Dyado', 100 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Baba', wp_html_excerpt( 'Baba &amp; Dyado', 8 ) );

+               $this->assertSame( 'Baba', wp_html_excerpt( 'Baba &#038; Dyado', 8 ) );

+               $this->assertSame( 'Baba &amp; D', wp_html_excerpt( 'Baba &amp; Dyado', 12 ) );

+               $this->assertSame( 'Baba &amp; Dyado', wp_html_excerpt( 'Baba &amp; Dyado', 100 ) );

</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="trunktestsphpunittestsformattingHumanTimeDiffphp"></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/HumanTimeDiff.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/HumanTimeDiff.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/HumanTimeDiff.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_human_time_diff( $expected, $stopdate, $message ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $startdate = new DateTime( '2016-01-01 12:00:00' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, human_time_diff( $startdate->format( 'U' ), $stopdate->format( 'U' ) ), $message );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, human_time_diff( $startdate->format( 'U' ), $stopdate->format( 'U' ) ), $message );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">        // Data for test_human_time_diff.

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingIsEmailphp"></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/IsEmail.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/IsEmail.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/IsEmail.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'a@b.co',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $data as $datum ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $datum, is_email( $datum ), $datum );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $datum, is_email( $datum ), $datum );

</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="trunktestsphpunittestsformattingJSEscapephp"></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/JSEscape.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/JSEscape.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/JSEscape.php   2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,13 +6,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_JSEscape extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function test_js_escape_simple() {

</span><span class="cx" style="display: block; padding: 0 10px">                $out = esc_js( 'foo bar baz();' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foo bar baz();', $out );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foo bar baz();', $out );

</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_js_escape_quotes() {

</span><span class="cx" style="display: block; padding: 0 10px">                $out = esc_js( 'foo "bar" \'baz\'' );

<span class="cx" style="display: block; padding: 0 10px">                // Does it make any sense to change " into &quot;?  Why not \"?

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "foo &quot;bar&quot; \'baz\'", $out );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "foo &quot;bar&quot; \'baz\'", $out );

</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_js_escape_backslash() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,17 +19,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $bs  = '\\';

</span><span class="cx" style="display: block; padding: 0 10px">                $out = esc_js( 'foo ' . $bs . 't bar ' . $bs . $bs . ' baz' );

</span><span class="cx" style="display: block; padding: 0 10px">                // \t becomes t - bug?

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foo t bar ' . $bs . $bs . ' baz', $out );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foo t bar ' . $bs . $bs . ' baz', $out );

</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_js_escape_amp() {

</span><span class="cx" style="display: block; padding: 0 10px">                $out = esc_js( 'foo & bar &baz; &nbsp;' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foo &amp; bar &amp;baz; &nbsp;', $out );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foo &amp; bar &amp;baz; &nbsp;', $out );

</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_js_escape_quote_entity() {

</span><span class="cx" style="display: block; padding: 0 10px">                $out = esc_js( 'foo &#x27; bar &#39; baz &#x26;' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "foo \\' bar \\' baz &#x26;", $out );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "foo \\' bar \\' baz &#x26;", $out );

</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_js_no_carriage_return() {

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingLikeEscapephp"></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/LikeEscape.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/LikeEscape.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/LikeEscape.php 2020-09-02 00:35:36 UTC (rev 48937)

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $inputs as $key => $input ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $key ], like_escape( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $key ], like_escape( $input ) );

</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="trunktestsphpunittestsformattingLinksAddTargetphp"></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/LinksAddTarget.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/LinksAddTarget.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/LinksAddTarget.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,11 +74,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_normalize_whitespace( $content, $target, $tags, $exp_str ) {

</span><span class="cx" style="display: block; padding: 0 10px">                if ( true === is_null( $target ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $exp_str, links_add_target( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $exp_str, links_add_target( $content ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 } elseif ( true === is_null( $tags ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $exp_str, links_add_target( $content, $target ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $exp_str, links_add_target( $content, $target ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $exp_str, links_add_target( $content, $target, $tags ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $exp_str, links_add_target( $content, $target, $tags ) );

</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="trunktestsphpunittestsformattingMakeClickablephp"></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/MakeClickable.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/MakeClickable.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/MakeClickable.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_MakeClickable extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function test_mailto_xss() {

</span><span class="cx" style="display: block; padding: 0 10px">                $in = 'testzzz@"STYLE="behavior:url(\'#default#time2\')"onBegin="alert(\'refresh-XSS\')"';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $in, make_clickable( $in ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $in, make_clickable( $in ) );

</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_valid_mailto() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'foo@example-example.com',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $valid_emails as $email ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( '<a href="mailto:' . $email . '">' . $email . '</a>', make_clickable( $email ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( '<a href="mailto:' . $email . '">' . $email . '</a>', make_clickable( $email ) );

</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">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'foo@example',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $invalid_emails as $email ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $email, make_clickable( $email ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $email, make_clickable( $email ) );

</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">@@ -59,7 +59,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">                foreach ( $urls_before as $key => $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,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">                foreach ( $urls_before as $key => $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,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">                foreach ( $urls_before as $key => $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,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">                foreach ( $urls_before as $key => $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +161,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        '<a href="http://example.com/?a=баба&#038;b=дядо" rel="nofollow">http://example.com/?a=баба&#038;b=дядо</a>',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $urls_before as $key => $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,7 +198,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        Richard Hamming wrote about people getting more done with their doors closed, but',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $urls_before as $key => $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +221,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'In his famous speech “You and Your research” (here: <a href="http://www.cs.virginia.edu/~robins/YouAndYourResearch.html" rel="nofollow">http://www.cs.virginia.edu/~robins/YouAndYourResearch.html</a>) Richard Hamming wrote about people getting more done with their doors closed...',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $urls_before as $key => $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +240,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'This is a really good tweet <a href="http://twitter.com/#!/wordpress/status/25907440233" rel="nofollow">http://twitter.com/#!/wordpress/status/25907440233</a>!',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $urls_before as $key => $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +256,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'mailto wrapped in angle brackets <foo@example.com>',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $before as $key => $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $key ], make_clickable( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $key ], make_clickable( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,7 +278,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'Question mark then URL?<a href="http://example.com/" rel="nofollow">http://example.com/</a>',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $before as $key => $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $key ], make_clickable( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $key ], make_clickable( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +302,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        '<a href="http://example.com/example.gif" title="Image from http://example.com">Look at this image!</a>',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $urls_before as $key => $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +343,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">                foreach ( $before as $key => $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $key ], make_clickable( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $key ], make_clickable( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,7 +360,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        '<p><a href="http://example.com/" rel="nofollow">http://example.com/</a></p>',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $urls_before as $key => $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 }

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,7 +370,7 @@

<span class="cx" style="display: block; padding: 0 10px">                        // '<a href="http://wordpress.org">This is already a link www.wordpress.org</a>', // Fails in 3.3.1 too.

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $in as $text ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $text, make_clickable( $text ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $text, make_clickable( $text ) );

</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">@@ -380,7 +380,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_no_segfault() {

</span><span class="cx" style="display: block; padding: 0 10px">                $in  = str_repeat( 'http://example.com/2011/03/18/post-title/', 256 );

</span><span class="cx" style="display: block; padding: 0 10px">                $out = make_clickable( $in );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $in, $out );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $in, $out );

</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">@@ -389,7 +389,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_line_break_in_existing_clickable_link() {

</span><span class="cx" style="display: block; padding: 0 10px">                $html = "<a

</span><span class="cx" style="display: block; padding: 0 10px">                                  href='mailto:someone@example.com'>someone@example.com</a>";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $html, make_clickable( $html ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $html, make_clickable( $html ) );

</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">@@ -397,7 +397,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_script_and_style_tags

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_dont_link_script_and_style_tags( $tag ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $tag, make_clickable( $tag ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $tag, make_clickable( $tag ) );

</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 data_script_and_style_tags() {

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingMapDeepphp"></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/MapDeep.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/MapDeep.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/MapDeep.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,11 +7,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_MapDeep extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_map_deep_with_any_function_over_empty_array_should_return_empty_array() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array(), map_deep( array(), array( $this, 'append_baba' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), map_deep( array(), array( $this, 'append_baba' ) ) );

</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_map_deep_should_map_each_element_of_array_one_level_deep() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'ababa',

</span><span class="cx" style="display: block; padding: 0 10px">                                'xbaba',

</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">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_map_deep_should_map_each_element_of_array_two_levels_deep() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'ababa',

</span><span class="cx" style="display: block; padding: 0 10px">                                array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,11 +67,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_map_deep_should_apply_the_function_to_a_string() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'xbaba', map_deep( 'x', array( $this, 'append_baba' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'xbaba', map_deep( 'x', array( $this, 'append_baba' ) ) );

</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_map_deep_should_apply_the_function_to_an_integer() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '5baba', map_deep( 5, array( $this, 'append_baba' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '5baba', map_deep( 5, array( $this, 'append_baba' ) ) );

</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_map_deep_should_map_each_property_of_an_object() {

</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">                        'var0' => &$array_a['var0'],

</span><span class="cx" style="display: block; padding: 0 10px">                        'var1' => 'x',

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'var0' => 'ababa',

</span><span class="cx" style="display: block; padding: 0 10px">                                'var1' => 'xbaba',

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingNormalizeWhitespacephp"></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/NormalizeWhitespace.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/NormalizeWhitespace.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/NormalizeWhitespace.php        2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,6 +47,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider get_input_output

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_normalize_whitespace( $in_str, $exp_str ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $exp_str, normalize_whitespace( $in_str ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $exp_str, normalize_whitespace( $in_str ) );

</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="trunktestsphpunittestsformattingRemoveAccentsphp"></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/RemoveAccents.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/RemoveAccents.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/RemoveAccents.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_RemoveAccents extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_remove_accents_simple() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'abcdefghijkl', remove_accents( 'abcdefghijkl' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'abcdefghijkl', remove_accents( 'abcdefghijkl' ) );

</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">@@ -15,7 +15,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $input  = 'ªºÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ';

</span><span class="cx" style="display: block; padding: 0 10px">                $output = 'aoAAAAAAAECEEEEIIIIDNOOOOOOUUUUYTHsaaaaaaaeceeeeiiiidnoooooouuuuythy';

</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->assertEquals( $output, remove_accents( $input ), 'remove_accents replaces Latin-1 Supplement' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $output, remove_accents( $input ), 'remove_accents replaces Latin-1 Supplement' );

</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_remove_accents_latin_extended_a() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,16 +22,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $input  = 'ĀāĂăĄąĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħĨĩĪīĬĭĮįİıĲĳĴĵĶķĸĹĺĻļĽľĿŀŁłŃńŅņŇňŉŊŋŌōŎŏŐőŒœŔŕŖŗŘřŚśŜŝŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſ';

</span><span class="cx" style="display: block; padding: 0 10px">                $output = 'AaAaAaCcCcCcCcDdDdEeEeEeEeEeGgGgGgGgHhHhIiIiIiIiIiIJijJjKkkLlLlLlLlLlNnNnNnnNnOoOoOoOEoeRrRrRrSsSsSsSsTtTtTtUuUuUuUuUuUuWwYyYZzZzZzs';

</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->assertEquals( $output, remove_accents( $input ), 'remove_accents replaces Latin Extended A' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $output, remove_accents( $input ), 'remove_accents replaces Latin Extended A' );

</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_remove_accents_latin_extended_b() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'SsTt', remove_accents( 'ȘșȚț' ), 'remove_accents replaces Latin Extended B' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'SsTt', remove_accents( 'ȘșȚț' ), 'remove_accents replaces Latin Extended B' );

</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_remove_accents_euro_pound_signs() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'E', remove_accents( '€' ), 'remove_accents replaces euro sign' );

-               $this->assertEquals( '', remove_accents( '£' ), 'remove_accents replaces pound sign' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'E', remove_accents( '€' ), 'remove_accents replaces euro sign' );

+               $this->assertSame( '', remove_accents( '£' ), 'remove_accents replaces pound sign' );

</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_remove_accents_iso8859() {

</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">                $input  = trim( $input );

</span><span class="cx" style="display: block; padding: 0 10px">                $output = 'EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyyOEoeAEDHTHssaedhth';

</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->assertEquals( $output, remove_accents( $input ), 'remove_accents from ISO-8859-1 text' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $output, remove_accents( $input ), 'remove_accents from ISO-8859-1 text' );

</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">@@ -50,17 +50,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_remove_accents_vowels_diacritic() {

<span class="cx" style="display: block; padding: 0 10px">                // Vowels with diacritic.

</span><span class="cx" style="display: block; padding: 0 10px">                // Unmarked.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'OoUu', remove_accents( 'ƠơƯư' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'OoUu', remove_accents( 'ƠơƯư' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Grave accent.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'AaAaEeOoOoUuYy', remove_accents( 'ẦầẰằỀềỒồỜờỪừỲỳ' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'AaAaEeOoOoUuYy', remove_accents( 'ẦầẰằỀềỒồỜờỪừỲỳ' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Hook.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'AaAaAaEeEeIiOoOoOoUuUuYy', remove_accents( 'ẢảẨẩẲẳẺẻỂểỈỉỎỏỔổỞởỦủỬửỶỷ' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'AaAaAaEeEeIiOoOoOoUuUuYy', remove_accents( 'ẢảẨẩẲẳẺẻỂểỈỉỎỏỔổỞởỦủỬửỶỷ' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Tilde.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'AaAaEeEeOoOoUuYy', remove_accents( 'ẪẫẴẵẼẽỄễỖỗỠỡỮữỸỹ' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'AaAaEeEeOoOoUuYy', remove_accents( 'ẪẫẴẵẼẽỄễỖỗỠỡỮữỸỹ' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Acute accent.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'AaAaEeOoOoUu', remove_accents( 'ẤấẮắẾếỐốỚớỨứ' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'AaAaEeOoOoUu', remove_accents( 'ẤấẮắẾếỐốỚớỨứ' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Dot below.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'AaAaAaEeEeIiOoOoOoUuUuYy', remove_accents( 'ẠạẬậẶặẸẹỆệỊịỌọỘộỢợỤụỰựỴỵ' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'AaAaAaEeEeIiOoOoOoUuUuYy', remove_accents( 'ẠạẬậẶặẸẹỆệỊịỌọỘộỢợỤụỰựỴỵ' ) );

</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">@@ -69,15 +69,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_remove_accents_hanyu_pinyin() {

<span class="cx" style="display: block; padding: 0 10px">                // Vowels with diacritic (Chinese, Hanyu Pinyin).

</span><span class="cx" style="display: block; padding: 0 10px">                // Macron.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'aeiouuAEIOUU', remove_accents( 'āēīōūǖĀĒĪŌŪǕ' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'aeiouuAEIOUU', remove_accents( 'āēīōūǖĀĒĪŌŪǕ' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Acute accent.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'aeiouuAEIOUU', remove_accents( 'áéíóúǘÁÉÍÓÚǗ' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'aeiouuAEIOUU', remove_accents( 'áéíóúǘÁÉÍÓÚǗ' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Caron.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'aeiouuAEIOUU', remove_accents( 'ǎěǐǒǔǚǍĚǏǑǓǙ' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'aeiouuAEIOUU', remove_accents( 'ǎěǐǒǔǚǍĚǏǑǓǙ' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Grave accent.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'aeiouuAEIOUU', remove_accents( 'àèìòùǜÀÈÌÒÙǛ' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'aeiouuAEIOUU', remove_accents( 'àèìòùǜÀÈÌÒÙǛ' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Unmarked.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'aaeiouuAEIOUU', remove_accents( 'aɑeiouüAEIOUÜ' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'aaeiouuAEIOUU', remove_accents( 'aɑeiouüAEIOUÜ' ) );

</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 _remove_accents_germanic_umlauts_cb() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_remove_accents_germanic_umlauts() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'locale', array( $this, '_remove_accents_germanic_umlauts_cb' ) );

</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->assertEquals( 'AeOeUeaeoeuess', remove_accents( 'ÄÖÜäöüß' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'AeOeUeaeoeuess', remove_accents( 'ÄÖÜäöüß' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'locale', array( $this, '_remove_accents_germanic_umlauts_cb' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_remove_danish_accents() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'locale', array( $this, '_set_locale_to_danish' ) );

</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->assertEquals( 'AeOeAaaeoeaa', remove_accents( 'ÆØÅæøå' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'AeOeAaaeoeaa', remove_accents( 'ÆØÅæøå' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'locale', array( $this, '_set_locale_to_danish' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,11 +120,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_remove_catalan_middot() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'locale', array( $this, '_set_locale_to_catalan' ) );

</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->assertEquals( 'allallalla', remove_accents( 'al·lallaŀla' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'allallalla', remove_accents( 'al·lallaŀla' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'locale', array( $this, '_set_locale_to_catalan' ) );

</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->assertEquals( 'al·lallalla', remove_accents( 'al·lallaŀla' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'al·lallalla', remove_accents( 'al·lallaŀla' ) );

</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 _set_locale_to_serbian() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,10 +137,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_transcribe_serbian_crossed_d() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'locale', array( $this, '_set_locale_to_serbian' ) );

</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->assertEquals( 'DJdj', remove_accents( 'Đđ' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'DJdj', remove_accents( 'Đđ' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'locale', array( $this, '_set_locale_to_serbian' ) );

</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->assertEquals( 'Dd', remove_accents( 'Đđ' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Dd', remove_accents( 'Đđ' ) );

</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="trunktestsphpunittestsformattingSanitizeFileNamephp"></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/SanitizeFileName.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SanitizeFileName.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/SanitizeFileName.php   2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_munges_extensions() {

</span><span class="cx" style="display: block; padding: 0 10px">                # r17990

</span><span class="cx" style="display: block; padding: 0 10px">                $file_name = sanitize_file_name( 'test.phtml.txt' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'test.phtml_.txt', $file_name );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'test.phtml_.txt', $file_name );

</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_removes_special_chars() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $string .= $char;

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px">                $string .= 'test';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'testtest', sanitize_file_name( $string ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'testtest', sanitize_file_name( $string ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</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">        function test_removes_accents() {

</span><span class="cx" style="display: block; padding: 0 10px">                $in  = 'àáâãäåæçèéêëìíîïñòóôõöøùúûüýÿ';

</span><span class="cx" style="display: block; padding: 0 10px">                $out = 'aaaaaaaeceeeeiiiinoooooouuuuyy';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $out, sanitize_file_name( $in ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $out, sanitize_file_name( $in ) );

</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,21 +43,21 @@

</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 ( $urls as $test => $expected ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected, sanitize_file_name( $test ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected, sanitize_file_name( $test ) );

</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">        function test_replaces_any_number_of_hyphens_with_one_hyphen() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a-t-t', sanitize_file_name( 'a----t----t' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a-t-t', sanitize_file_name( 'a----t----t' ) );

</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_trims_trailing_hyphens() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a-t-t', sanitize_file_name( 'a----t----t----' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a-t-t', sanitize_file_name( 'a----t----t----' ) );

</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_replaces_any_amount_of_whitespace_with_one_hyphen() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a-t', sanitize_file_name( 'a          t' ) );

-               $this->assertEquals( 'a-t', sanitize_file_name( "a    \n\n\nt" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a-t', sanitize_file_name( 'a          t' ) );

+               $this->assertSame( 'a-t', sanitize_file_name( "a    \n\n\nt" ) );

</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">@@ -64,18 +64,18 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 16226

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_replaces_percent_sign() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a22b.jpg', sanitize_file_name( 'a%22b.jpg' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a22b.jpg', sanitize_file_name( 'a%22b.jpg' ) );

</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_replaces_unnamed_file_extensions() {

<span class="cx" style="display: block; padding: 0 10px">                // Test filenames with both supported and unsupported extensions.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'unnamed-file.exe', sanitize_file_name( '_.exe' ) );

-               $this->assertEquals( 'unnamed-file.jpg', sanitize_file_name( '_.jpg' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'unnamed-file.exe', sanitize_file_name( '_.exe' ) );

+               $this->assertSame( 'unnamed-file.jpg', sanitize_file_name( '_.jpg' ) );

</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_replaces_unnamed_file_extensionless() {

<span class="cx" style="display: block; padding: 0 10px">                // Test a filenames that becomes extensionless.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'no-extension', sanitize_file_name( '_.no-extension' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'no-extension', sanitize_file_name( '_.no-extension' ) );

</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">@@ -82,7 +82,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_wp_filenames

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_replaces_invalid_utf8_characters( $input, $expected ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, sanitize_file_name( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, sanitize_file_name( $input ) );

</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 data_wp_filenames() {

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingSanitizeMimeTypephp"></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/SanitizeMimeType.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SanitizeMimeType.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/SanitizeMimeType.php   2020-09-02 00:35:36 UTC (rev 48937)

</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">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $inputs as $input ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $input, sanitize_mime_type( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $input, sanitize_mime_type( $input ) );

</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="trunktestsphpunittestsformattingSanitizeOrderbyphp"></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/SanitizeOrderby.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SanitizeOrderby.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/SanitizeOrderby.php    2020-09-02 00:35:36 UTC (rev 48937)

</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">         * @dataProvider valid_orderbys

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_valid( $orderby ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $orderby, sanitize_sql_orderby( $orderby ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $orderby, sanitize_sql_orderby( $orderby ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px">        function valid_orderbys() {

</span><span class="cx" style="display: block; padding: 0 10px">                return array(

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingSanitizeTextFieldphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/SanitizeTextField.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SanitizeTextField.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/SanitizeTextField.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,8 +136,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $expected_oneline   = $expected;

</span><span class="cx" style="display: block; padding: 0 10px">                        $expected_multiline = $expected;

</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->assertEquals( $expected_oneline, sanitize_text_field( $string ) );

-               $this->assertEqualsIgnoreEOL( $expected_multiline, sanitize_textarea_field( $string ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_oneline, sanitize_text_field( $string ) );

+               $this->assertSameIgnoreEOL( $expected_multiline, sanitize_textarea_field( $string ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingSanitizeTitlephp"></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/SanitizeTitle.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SanitizeTitle.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/SanitizeTitle.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,12 +7,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_strips_html() {

</span><span class="cx" style="display: block; padding: 0 10px">                $input    = 'Captain <strong>Awesome</strong>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'captain-awesome';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, sanitize_title( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, sanitize_title( $input ) );

</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_titles_sanitized_to_nothing_are_replaced_with_optional_fallback() {

</span><span class="cx" style="display: block; padding: 0 10px">                $input    = '<strong></strong>';

</span><span class="cx" style="display: block; padding: 0 10px">                $fallback = 'Captain Awesome';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $fallback, sanitize_title( $input, $fallback ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $fallback, sanitize_title( $input, $fallback ) );

</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="trunktestsphpunittestsformattingSanitizeTitleWithDashesphp"></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/SanitizeTitleWithDashes.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,60 +7,60 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_strips_html() {

</span><span class="cx" style="display: block; padding: 0 10px">                $input    = 'Captain <strong>Awesome</strong>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'captain-awesome';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, sanitize_title( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, sanitize_title( $input ) );

</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_strips_unencoded_percent_signs() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'fran%c3%a7ois', sanitize_title_with_dashes( 'fran%c3%a7%ois' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'fran%c3%a7ois', sanitize_title_with_dashes( 'fran%c3%a7%ois' ) );

</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_makes_title_lowercase() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'abc', sanitize_title_with_dashes( 'ABC' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'abc', sanitize_title_with_dashes( 'ABC' ) );

</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_replaces_any_amount_of_whitespace_with_one_hyphen() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a-t', sanitize_title_with_dashes( 'a          t' ) );

-               $this->assertEquals( 'a-t', sanitize_title_with_dashes( "a    \n\n\nt" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a-t', sanitize_title_with_dashes( 'a          t' ) );

+               $this->assertSame( 'a-t', sanitize_title_with_dashes( "a    \n\n\nt" ) );

</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_replaces_any_number_of_hyphens_with_one_hyphen() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a-t-t', sanitize_title_with_dashes( 'a----t----t' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a-t-t', sanitize_title_with_dashes( 'a----t----t' ) );

</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_trims_trailing_hyphens() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a-t-t', sanitize_title_with_dashes( 'a----t----t----' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a-t-t', sanitize_title_with_dashes( 'a----t----t----' ) );

</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_handles_non_entity_ampersands() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'penn-teller-bull', sanitize_title_with_dashes( 'penn & teller bull' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'penn-teller-bull', sanitize_title_with_dashes( 'penn & teller bull' ) );

</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_strips_nbsp_ndash_and_amp() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'no-entities-here', sanitize_title_with_dashes( 'No &nbsp; Entities &ndash; Here &amp;' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'no-entities-here', sanitize_title_with_dashes( 'No &nbsp; Entities &ndash; Here &amp;' ) );

</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_strips_encoded_ampersand() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'one-two', sanitize_title_with_dashes( 'One &amp; Two', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'one-two', sanitize_title_with_dashes( 'One &amp; Two', '', 'save' ) );

</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_strips_url_encoded_ampersand() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'one-two', sanitize_title_with_dashes( 'One &#123; Two;', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'one-two', sanitize_title_with_dashes( 'One &#123; Two;', '', 'save' ) );

</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_strips_trademark_symbol() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'one-two', sanitize_title_with_dashes( 'One Two™;', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'one-two', sanitize_title_with_dashes( 'One Two™;', '', 'save' ) );

</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_strips_unencoded_ampersand_followed_by_encoded_ampersand() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'one-two', sanitize_title_with_dashes( 'One &&amp; Two;', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'one-two', sanitize_title_with_dashes( 'One &&amp; Two;', '', 'save' ) );

</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_strips_unencoded_ampersand_when_not_surrounded_by_spaces() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'onetwo', sanitize_title_with_dashes( 'One&Two', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'onetwo', sanitize_title_with_dashes( 'One&Two', '', 'save' ) );

</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_replaces_nbsp() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'dont-break-the-space', sanitize_title_with_dashes( "don't break the space", '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'dont-break-the-space', sanitize_title_with_dashes( "don't break the space", '', 'save' ) );

</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">@@ -67,12 +67,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 31790

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_replaces_nbsp_entities() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'dont-break-the-space', sanitize_title_with_dashes( "don't&nbsp;break&#160;the&nbsp;space", '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'dont-break-the-space', sanitize_title_with_dashes( "don't&nbsp;break&#160;the&nbsp;space", '', 'save' ) );

</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_replaces_ndash_mdash() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'do-the-dash', sanitize_title_with_dashes( 'Do – the Dash', '', 'save' ) );

-               $this->assertEquals( 'do-the-dash', sanitize_title_with_dashes( 'Do the — Dash', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'do-the-dash', sanitize_title_with_dashes( 'Do – the Dash', '', 'save' ) );

+               $this->assertSame( 'do-the-dash', sanitize_title_with_dashes( 'Do the — Dash', '', 'save' ) );

</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">@@ -79,26 +79,26 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 31790

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_replaces_ndash_mdash_entities() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'do-the-dash', sanitize_title_with_dashes( 'Do &ndash; the &#8211; Dash', '', 'save' ) );

-               $this->assertEquals( 'do-the-dash', sanitize_title_with_dashes( 'Do &mdash; the &#8212; Dash', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'do-the-dash', sanitize_title_with_dashes( 'Do &ndash; the &#8211; Dash', '', 'save' ) );

+               $this->assertSame( 'do-the-dash', sanitize_title_with_dashes( 'Do &mdash; the &#8212; Dash', '', 'save' ) );

</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_replaces_iexcel_iquest() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'just-a-slug', sanitize_title_with_dashes( 'Just ¡a Slug', '', 'save' ) );

-               $this->assertEquals( 'just-a-slug', sanitize_title_with_dashes( 'Just a Slug¿', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( 'Just ¡a Slug', '', 'save' ) );

+               $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( 'Just a Slug¿', '', 'save' ) );

</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_replaces_angle_quotes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'just-a-slug', sanitize_title_with_dashes( '‹Just a Slug›', '', 'save' ) );

-               $this->assertEquals( 'just-a-slug', sanitize_title_with_dashes( '«Just a Slug»', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( '‹Just a Slug›', '', 'save' ) );

+               $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( '«Just a Slug»', '', 'save' ) );

</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_replaces_curly_quotes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'hey-its-curly-joe', sanitize_title_with_dashes( 'Hey its “Curly Joe”', '', 'save' ) );

-               $this->assertEquals( 'hey-its-curly-joe', sanitize_title_with_dashes( 'Hey its ‘Curly Joe’', '', 'save' ) );

-               $this->assertEquals( 'hey-its-curly-joe', sanitize_title_with_dashes( 'Hey its „Curly Joe“', '', 'save' ) );

-               $this->assertEquals( 'hey-its-curly-joe', sanitize_title_with_dashes( 'Hey its ‚Curly Joe‛', '', 'save' ) );

-               $this->assertEquals( 'hey-its-curly-joe', sanitize_title_with_dashes( 'Hey its „Curly Joe‟', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'hey-its-curly-joe', sanitize_title_with_dashes( 'Hey its “Curly Joe”', '', 'save' ) );

+               $this->assertSame( 'hey-its-curly-joe', sanitize_title_with_dashes( 'Hey its ‘Curly Joe’', '', 'save' ) );

+               $this->assertSame( 'hey-its-curly-joe', sanitize_title_with_dashes( 'Hey its „Curly Joe“', '', 'save' ) );

+               $this->assertSame( 'hey-its-curly-joe', sanitize_title_with_dashes( 'Hey its ‚Curly Joe‛', '', 'save' ) );

+               $this->assertSame( 'hey-its-curly-joe', sanitize_title_with_dashes( 'Hey its „Curly Joe‟', '', 'save' ) );

</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">@@ -105,14 +105,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 49791

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_replaces_bullet() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'fancy-title-amazing', sanitize_title_with_dashes( 'Fancy Title • Amazing', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'fancy-title-amazing', sanitize_title_with_dashes( 'Fancy Title • Amazing', '', 'save' ) );

</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_replaces_copy_reg_deg_trade() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'just-a-slug', sanitize_title_with_dashes( 'Just © a Slug', '', 'save' ) );

-               $this->assertEquals( 'just-a-slug', sanitize_title_with_dashes( '® Just a Slug', '', 'save' ) );

-               $this->assertEquals( 'just-a-slug', sanitize_title_with_dashes( 'Just a ° Slug', '', 'save' ) );

-               $this->assertEquals( 'just-a-slug', sanitize_title_with_dashes( 'Just ™ a Slug', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( 'Just © a Slug', '', 'save' ) );

+               $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( '® Just a Slug', '', 'save' ) );

+               $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( 'Just a ° Slug', '', 'save' ) );

+               $this->assertSame( 'just-a-slug', sanitize_title_with_dashes( 'Just ™ a Slug', '', 'save' ) );

</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">@@ -119,11 +119,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 10792

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_replaces_forward_slash() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'songs-by-lennon-mccartney', sanitize_title_with_dashes( 'songs by Lennon/McCartney', '', 'save' ) );

-               $this->assertEquals( 'songs-by-lennon-mccartney', sanitize_title_with_dashes( 'songs by Lennon//McCartney', '', 'save' ) );

-               $this->assertEquals( 'songs-by-lennon-mccartney', sanitize_title_with_dashes( 'songs by Lennon///McCartney', '', 'save' ) );

-               $this->assertEquals( 'songs-by-lennon-mccartney', sanitize_title_with_dashes( 'songs by Lennon/-McCartney', '', 'save' ) );

-               $this->assertEquals( 'songs-by-lennon-mccartney', sanitize_title_with_dashes( '//songs by Lennon/McCartney', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'songs-by-lennon-mccartney', sanitize_title_with_dashes( 'songs by Lennon/McCartney', '', 'save' ) );

+               $this->assertSame( 'songs-by-lennon-mccartney', sanitize_title_with_dashes( 'songs by Lennon//McCartney', '', 'save' ) );

+               $this->assertSame( 'songs-by-lennon-mccartney', sanitize_title_with_dashes( 'songs by Lennon///McCartney', '', 'save' ) );

+               $this->assertSame( 'songs-by-lennon-mccartney', sanitize_title_with_dashes( 'songs by Lennon/-McCartney', '', 'save' ) );

+               $this->assertSame( 'songs-by-lennon-mccartney', sanitize_title_with_dashes( '//songs by Lennon/McCartney', '', 'save' ) );

</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">@@ -130,7 +130,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 19820

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_replaces_multiply_sign() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '6x7-is-42', sanitize_title_with_dashes( '6×7 is 42', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '6x7-is-42', sanitize_title_with_dashes( '6×7 is 42', '', 'save' ) );

</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">@@ -137,7 +137,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 20772

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_replaces_standalone_diacritic() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'aaaa', sanitize_title_with_dashes( 'āáǎà', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'aaaa', sanitize_title_with_dashes( 'āáǎà', '', 'save' ) );

</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">@@ -144,7 +144,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 22395

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_replaces_acute_accents() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'aaaa', sanitize_title_with_dashes( 'ááa´aˊ', '', 'save' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'aaaa', sanitize_title_with_dashes( 'ááa´aˊ', '', 'save' ) );

</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="trunktestsphpunittestsformattingSanitizeTrackbackUrlsphp"></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/SanitizeTrackbackUrls.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SanitizeTrackbackUrls.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/SanitizeTrackbackUrls.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider breaks

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_sanitize_trackback_urls_with_multiple_urls( $break ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "http://example.com\nhttp://example.org", sanitize_trackback_urls( "http://example.com{$break}http://example.org" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "http://example.com\nhttp://example.org", sanitize_trackback_urls( "http://example.com{$break}http://example.org" ) );

</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 breaks() {

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingSanitizeUserphp"></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/SanitizeUser.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/SanitizeUser.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/SanitizeUser.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_strips_html() {

</span><span class="cx" style="display: block; padding: 0 10px">                $input    = 'Captain <strong>Awesome</strong>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = is_multisite() ? 'captain awesome' : 'Captain Awesome';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, sanitize_user( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, sanitize_user( $input ) );

</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_strips_encoded_ampersand() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $expected = strtolower( $expected );

</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->assertEquals( $expected, sanitize_user( 'AT&amp;T' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, sanitize_user( 'AT&amp;T' ) );

</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_strips_encoded_ampersand_when_followed_by_semicolon() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,14 +29,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $expected = strtolower( $expected );

</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->assertEquals( $expected, sanitize_user( 'AT&amp;T Test;' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, sanitize_user( 'AT&amp;T Test;' ) );

</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_strips_percent_encoded_octets() {

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = is_multisite() ? 'franois' : 'Franois';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, sanitize_user( 'Fran%c3%a7ois' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, sanitize_user( 'Fran%c3%a7ois' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px">        function test_optional_strict_mode_reduces_to_safe_ascii_subset() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'abc', sanitize_user( '()~ab~ˆcˆ!', true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'abc', sanitize_user( '()~ab~ˆcˆ!', true ) );

</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="trunktestsphpunittestsformattingSlashitphp"></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/Slashit.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Slashit.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/Slashit.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,20 +5,20 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_Slashit extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function test_backslashes_middle_numbers() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "\\a-!9\\a943\\b\\c", backslashit( 'a-!9a943bc' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "\\a-!9\\a943\\b\\c", backslashit( 'a-!9a943bc' ) );

</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_backslashes_alphas() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "\\a943\\b\\c", backslashit( 'a943bc' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "\\a943\\b\\c", backslashit( 'a943bc' ) );

</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_double_backslashes_leading_numbers() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '\\\\95', backslashit( '95' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '\\\\95', backslashit( '95' ) );

</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_removes_trailing_slashes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a', untrailingslashit( 'a/' ) );

-               $this->assertEquals( 'a', untrailingslashit( 'a////' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a', untrailingslashit( 'a/' ) );

+               $this->assertSame( 'a', untrailingslashit( 'a////' ) );

</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">@@ -25,8 +25,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 22267

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_removes_trailing_backslashes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a', untrailingslashit( 'a\\' ) );

-               $this->assertEquals( 'a', untrailingslashit( 'a\\\\\\\\' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a', untrailingslashit( 'a\\' ) );

+               $this->assertSame( 'a', untrailingslashit( 'a\\\\\\\\' ) );

</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">@@ -33,16 +33,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 22267

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_removes_trailing_mixed_slashes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a', untrailingslashit( 'a/\\' ) );

-               $this->assertEquals( 'a', untrailingslashit( 'a\\/\\///\\\\//' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a', untrailingslashit( 'a/\\' ) );

+               $this->assertSame( 'a', untrailingslashit( 'a\\/\\///\\\\//' ) );

</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_adds_trailing_slash() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a/', trailingslashit( 'a' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a/', trailingslashit( 'a' ) );

</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_does_not_add_trailing_slash_if_one_exists() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a/', trailingslashit( 'a/' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a/', trailingslashit( 'a/' ) );

</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">@@ -49,6 +49,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 22267

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_converts_trailing_backslash_to_slash_if_one_exists() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a/', trailingslashit( 'a\\' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a/', trailingslashit( 'a\\' ) );

</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="trunktestsphpunittestsformattingSmiliesphp"></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/Smilies.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Smilies.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/Smilies.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,12 +54,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                smilies_init();

</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->assertEquals( $converted_txt, convert_smilies( $in_txt ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $converted_txt, convert_smilies( $in_txt ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Standard smilies, use_smilies: OFF.

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'use_smilies', 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->assertEquals( $in_txt, convert_smilies( $in_txt ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $in_txt, convert_smilies( $in_txt ) );

</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">@@ -112,12 +112,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                smilies_init();

</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->assertEquals( $converted_txt, convert_smilies( $in_txt ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $converted_txt, convert_smilies( $in_txt ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Standard smilies, use_smilies: OFF.

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'use_smilies', 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->assertEquals( $in_txt, convert_smilies( $in_txt ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $in_txt, convert_smilies( $in_txt ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                $wpsmiliestrans = $trans_orig; // Reset original translations array.

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'use_smilies', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                smilies_init();

</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->assertEquals( $exp_str, convert_smilies( $in_str ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $exp_str, convert_smilies( $in_str ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Standard smilies, use_smilies: OFF.

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'use_smilies', 0 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,12 +205,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'use_smilies', 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                smilies_init();

</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->assertEquals( $converted_txt, convert_smilies( $in_txt ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $converted_txt, convert_smilies( $in_txt ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Custom smilies, use_smilies: OFF.

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'use_smilies', 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->assertEquals( $in_txt, convert_smilies( $in_txt ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $in_txt, convert_smilies( $in_txt ) );

</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">@@ -260,12 +260,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                smilies_init();

</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->assertEquals( $converted_txt, convert_smilies( $in_txt ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $converted_txt, convert_smilies( $in_txt ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Standard smilies, use_smilies: OFF.

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'use_smilies', 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->assertEquals( $in_txt, convert_smilies( $in_txt ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $in_txt, convert_smilies( $in_txt ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                $wpsmiliestrans = $orig_trans; // Reset original translations array.

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,7 +305,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                smilies_init();

</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->assertEquals( $converted_txt, convert_smilies( $in_txt ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $converted_txt, convert_smilies( $in_txt ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Standard smilies, use_smilies: OFF.

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'use_smilies', 0 );

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $txt = ':oops: I did it again';

</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->assertEquals( $txt, convert_smilies( $txt ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $txt, convert_smilies( $txt ) );

</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">@@ -339,7 +339,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $txt          = 'You played with my <3';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected_txt = 'You played with my \xe2\x9d\xa4';

</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->assertEquals( $expected_txt, convert_smilies( $txt ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_txt, convert_smilies( $txt ) );

</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="trunktestsphpunittestsformattingStripSlashesDeepphp"></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/StripSlashesDeep.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/StripSlashesDeep.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/StripSlashesDeep.php   2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,10 +10,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_preserves_original_datatype() {

</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->assertEquals( true, stripslashes_deep( true ) );

-               $this->assertEquals( false, stripslashes_deep( false ) );

-               $this->assertEquals( 4, stripslashes_deep( 4 ) );

-               $this->assertEquals( 'foo', stripslashes_deep( 'foo' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertTrue( stripslashes_deep( true ) );

+               $this->assertFalse( stripslashes_deep( false ) );

+               $this->assertSame( 4, stripslashes_deep( 4 ) );

+               $this->assertSame( 'foo', stripslashes_deep( 'foo' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $arr      = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'a' => true,

</span><span class="cx" style="display: block; padding: 0 10px">                        'b' => false,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,23 +21,23 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'd' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $arr['e'] = $arr; // Add a sub-array.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $arr, stripslashes_deep( $arr ) ); // Keyed array.

-               $this->assertEquals( array_values( $arr ), stripslashes_deep( array_values( $arr ) ) ); // Non-keyed.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $arr, stripslashes_deep( $arr ) ); // Keyed array.

+               $this->assertSame( array_values( $arr ), stripslashes_deep( array_values( $arr ) ) ); // Non-keyed.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $obj = new stdClass;

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $arr as $k => $v ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $obj->$k = $v;

</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->assertEquals( $obj, stripslashes_deep( $obj ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $obj, stripslashes_deep( $obj ) );

</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_strips_slashes() {

</span><span class="cx" style="display: block; padding: 0 10px">                $old = "I can\'t see, isn\'t that it?";

</span><span class="cx" style="display: block; padding: 0 10px">                $new = "I can't see, isn't that it?";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $new, stripslashes_deep( $old ) );

-               $this->assertEquals( $new, stripslashes_deep( "I can\\'t see, isn\\'t that it?" ) );

-               $this->assertEquals( array( 'a' => $new ), stripslashes_deep( array( 'a' => $old ) ) ); // Keyed array.

-               $this->assertEquals( array( $new ), stripslashes_deep( array( $old ) ) ); // Non-keyed.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $new, stripslashes_deep( $old ) );

+               $this->assertSame( $new, stripslashes_deep( "I can\\'t see, isn\\'t that it?" ) );

+               $this->assertSame( array( 'a' => $new ), stripslashes_deep( array( 'a' => $old ) ) ); // Keyed array.

+               $this->assertSame( array( $new ), stripslashes_deep( array( $old ) ) ); // Non-keyed.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $obj_old    = new stdClass;

</span><span class="cx" style="display: block; padding: 0 10px">                $obj_old->a = $old;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_permits_escaped_slash() {

</span><span class="cx" style="display: block; padding: 0 10px">                $txt = "I can't see, isn\'t that it?";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $txt, stripslashes_deep( "I can\'t see, isn\\\'t that it?" ) );

-               $this->assertEquals( $txt, stripslashes_deep( "I can\'t see, isn\\\\\'t that it?" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $txt, stripslashes_deep( "I can\'t see, isn\\\'t that it?" ) );

+               $this->assertSame( $txt, stripslashes_deep( "I can\'t see, isn\\\\\'t that it?" ) );

</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="trunktestsphpunittestsformattingURLShortenphp"></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/URLShorten.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/URLShorten.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/URLShorten.php 2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,10 +14,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'http://wordpress.org/about/philosophy/#decisions' => 'wordpress.org/about/philosophy/#&hellip;', // Shorten to 32 if > 35 after cleaning.

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $tests as $k => $v ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $v, url_shorten( $k ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $v, url_shorten( $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">                // Shorten to 31 if > 34 after cleaning.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'wordpress.org/about/philosophy/#&hellip;', url_shorten( 'http://wordpress.org/about/philosophy/#decisions' ), 31 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'wordpress.org/about/philosophy/#&hellip;', url_shorten( 'http://wordpress.org/about/philosophy/#decisions' ), 31 );

</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="trunktestsphpunittestsformattingUrlencodeDeepphp"></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/UrlencodeDeep.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/UrlencodeDeep.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/UrlencodeDeep.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @param string $expected

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_urlencode_deep_should_encode_individual_value( $actual, $expected ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, urlencode_deep( $actual ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, urlencode_deep( $actual ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = wp_list_pluck( $data, 0 );

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = wp_list_pluck( $data, 1 );

</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->assertEquals( $expected, urlencode_deep( $actual ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, urlencode_deep( $actual ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingUtf8UriEncodephp"></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/Utf8UriEncode.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Utf8UriEncode.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/Utf8UriEncode.php      2020-09-02 00:35:36 UTC (rev 48937)

</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">         * @dataProvider data

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_percent_encodes_non_reserved_characters( $utf8, $urlencoded ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $urlencoded, utf8_uri_encode( $utf8 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $urlencoded, utf8_uri_encode( $utf8 ) );

</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="trunktestsphpunittestsformattingWPBasenamephp"></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/WPBasename.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPBasename.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WPBasename.php 2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_WP_Basename extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_basename_unix() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         'file',

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_basename( '/home/test/file' )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_basename_unix_utf8_support() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         'žluťoučký kůň.txt',

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_basename( '/test/žluťoučký kůň.txt' )

</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">         * @ticket 22138

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_basename_windows() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         'file.txt',

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_basename( 'C:\Documents and Settings\User\file.txt' )

</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">         * @ticket 22138

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_basename_windows_utf8_support() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         'щипцы.txt',

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_basename( 'C:\test\щипцы.txt' )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingWPMakeLinkRelativephp"></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/WPMakeLinkRelative.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPMakeLinkRelative.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WPMakeLinkRelative.php 2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,13 +8,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_make_link_relative_with_http_scheme() {

</span><span class="cx" style="display: block; padding: 0 10px">                $link          = 'http://example.com/this-is-a-test-http-url/';

</span><span class="cx" style="display: block; padding: 0 10px">                $relative_link = wp_make_link_relative( $link );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/this-is-a-test-http-url/', $relative_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/this-is-a-test-http-url/', $relative_link );

</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_make_link_relative_with_https_scheme() {

</span><span class="cx" style="display: block; padding: 0 10px">                $link          = 'https://example.com/this-is-a-test-https-url/';

</span><span class="cx" style="display: block; padding: 0 10px">                $relative_link = wp_make_link_relative( $link );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/this-is-a-test-https-url/', $relative_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/this-is-a-test-https-url/', $relative_link );

</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">@@ -23,7 +23,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_make_link_relative_with_no_scheme() {

</span><span class="cx" style="display: block; padding: 0 10px">                $link          = '//example.com/this-is-a-test-schemeless-url/';

</span><span class="cx" style="display: block; padding: 0 10px">                $relative_link = wp_make_link_relative( $link );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/this-is-a-test-schemeless-url/', $relative_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/this-is-a-test-schemeless-url/', $relative_link );

</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">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_make_link_relative_should_retain_URL_param_that_is_also_a_URL() {

</span><span class="cx" style="display: block; padding: 0 10px">                $link          = 'https://example.com/this-is-a-test/?redirect=https://example.org/a-different-test-post/';

</span><span class="cx" style="display: block; padding: 0 10px">                $relative_link = wp_make_link_relative( $link );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '/this-is-a-test/?redirect=https://example.org/a-different-test-post/', $relative_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '/this-is-a-test/?redirect=https://example.org/a-different-test-post/', $relative_link );

</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">@@ -41,7 +41,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_make_link_relative_with_no_path() {

</span><span class="cx" style="display: block; padding: 0 10px">                $link          = 'http://example.com';

</span><span class="cx" style="display: block; padding: 0 10px">                $relative_link = wp_make_link_relative( $link );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', $relative_link );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', $relative_link );

</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="trunktestsphpunittestsformattingWPRelNoFollowphp"></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/WPRelNoFollow.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPRelNoFollow.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WPRelNoFollow.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_add_no_follow() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>This is some cool <a href="/">Code</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>This is some cool <a href=\"/\" rel=\"nofollow\">Code</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_rel_nofollow( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_rel_nofollow( $content ) );

</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">@@ -20,7 +20,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_convert_no_follow() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>This is some cool <a href="/" rel="weird">Code</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>This is some cool <a href=\"/\" rel=\"weird nofollow\">Code</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_rel_nofollow( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_rel_nofollow( $content ) );

</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">@@ -28,7 +28,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_wp_rel_nofollow

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_rel_nofollow( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( wp_slash( $output ), wp_rel_nofollow( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( wp_slash( $output ), wp_rel_nofollow( $input ) );

</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 data_wp_rel_nofollow() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,6 +78,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_append_no_follow_with_valueless_attribute() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>This is some cool <a href="demo.com" download rel="hola">Code</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>This is some cool <a href=\"demo.com\" download rel=\"hola nofollow\">Code</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_rel_nofollow( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_rel_nofollow( $content ) );

</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="trunktestsphpunittestsformattingWPRelUgcphp"></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/WPRelUgc.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPRelUgc.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WPRelUgc.php   2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_add_ugc() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>This is some cool <a href="/">Code</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>This is some cool <a href=\"/\" rel=\"nofollow ugc\">Code</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_rel_ugc( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_rel_ugc( $content ) );

</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">@@ -20,7 +20,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_convert_ugc() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>This is some cool <a href="/" rel="weird">Code</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>This is some cool <a href=\"/\" rel=\"weird nofollow ugc\">Code</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_rel_ugc( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_rel_ugc( $content ) );

</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">@@ -28,7 +28,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_wp_rel_ugc

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_rel_ugc( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( wp_slash( $output ), wp_rel_ugc( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( wp_slash( $output ), wp_rel_ugc( $input ) );

</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 data_wp_rel_ugc() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,6 +78,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_append_ugc_with_valueless_attribute() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>This is some cool <a href="demo.com" download rel="hola">Code</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>This is some cool <a href=\"demo.com\" download rel=\"hola nofollow ugc\">Code</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_rel_ugc( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_rel_ugc( $content ) );

</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="trunktestsphpunittestsformattingWPSlashphp"></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/WPSlash.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPSlash.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WPSlash.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,10 +57,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_adds_slashes() {

</span><span class="cx" style="display: block; padding: 0 10px">                $old = "I can't see, isn't that it?";

</span><span class="cx" style="display: block; padding: 0 10px">                $new = "I can\'t see, isn\'t that it?";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $new, wp_slash( $old ) );

-               $this->assertEquals( "I can\\\\\'t see, isn\\\\\'t that it?", wp_slash( $new ) );

-               $this->assertEquals( array( 'a' => $new ), wp_slash( array( 'a' => $old ) ) ); // Keyed array.

-               $this->assertEquals( array( $new ), wp_slash( array( $old ) ) ); // Non-keyed.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $new, wp_slash( $old ) );

+               $this->assertSame( "I can\\\\\'t see, isn\\\\\'t that it?", wp_slash( $new ) );

+               $this->assertSame( array( 'a' => $new ), wp_slash( array( 'a' => $old ) ) ); // Keyed array.

+               $this->assertSame( array( $new ), wp_slash( array( $old ) ) ); // Non-keyed.

</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">@@ -68,10 +68,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_preserves_original_datatype() {

</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->assertEquals( true, wp_slash( true ) );

-               $this->assertEquals( false, wp_slash( false ) );

-               $this->assertEquals( 4, wp_slash( 4 ) );

-               $this->assertEquals( 'foo', wp_slash( 'foo' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertTrue( wp_slash( true ) );

+               $this->assertFalse( wp_slash( false ) );

+               $this->assertSame( 4, wp_slash( 4 ) );

+               $this->assertSame( 'foo', wp_slash( 'foo' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $arr      = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        'a' => true,

</span><span class="cx" style="display: block; padding: 0 10px">                        'b' => false,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,14 +79,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'd' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $arr['e'] = $arr; // Add a sub-array.

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $arr, wp_slash( $arr ) ); // Keyed array.

-               $this->assertEquals( array_values( $arr ), wp_slash( array_values( $arr ) ) ); // Non-keyed.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $arr, wp_slash( $arr ) ); // Keyed array.

+               $this->assertSame( array_values( $arr ), wp_slash( array_values( $arr ) ) ); // Non-keyed.

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $obj = new stdClass;

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $arr as $k => $v ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $obj->$k = $v;

</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->assertEquals( $obj, wp_slash( $obj ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $obj, wp_slash( $obj ) );

</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">@@ -95,9 +95,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_add_even_more_slashes() {

</span><span class="cx" style="display: block; padding: 0 10px">                $old = 'single\\slash double\\\\slash triple\\\\\\slash';

</span><span class="cx" style="display: block; padding: 0 10px">                $new = 'single\\\\slash double\\\\\\\\slash triple\\\\\\\\\\\\slash';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $new, wp_slash( $old ) );

-               $this->assertEquals( array( 'a' => $new ), wp_slash( array( 'a' => $old ) ) ); // Keyed array.

-               $this->assertEquals( array( $new ), wp_slash( array( $old ) ) ); // Non-keyed.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $new, wp_slash( $old ) );

+               $this->assertSame( array( 'a' => $new ), wp_slash( array( 'a' => $old ) ) ); // Keyed array.

+               $this->assertSame( array( $new ), wp_slash( array( $old ) ) ); // Non-keyed.

</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="trunktestsphpunittestsformattingWPSpecialcharsphp"></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/WPSpecialchars.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPSpecialchars.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WPSpecialchars.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,10 +6,10 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_WPSpecialchars extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_specialchars_basics() {

</span><span class="cx" style="display: block; padding: 0 10px">                $html = '&amp;&lt;hello world&gt;';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $html, _wp_specialchars( $html ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $html, _wp_specialchars( $html ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $double = '&amp;amp;&amp;lt;hello world&amp;gt;';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $double, _wp_specialchars( $html, ENT_NOQUOTES, false, true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $double, _wp_specialchars( $html, ENT_NOQUOTES, false, true ) );

</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_allowed_entity_names() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                continue;

</span><span class="cx" style="display: block; padding: 0 10px">                        }

</span><span class="cx" style="display: block; padding: 0 10px">                        $ent = '&' . $ent . ';';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $ent, _wp_specialchars( $ent ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $ent, _wp_specialchars( $ent ) );

</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">@@ -32,16 +32,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $ents as $ent ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $escaped = '&amp;' . $ent . ';';

</span><span class="cx" style="display: block; padding: 0 10px">                        $ent     = '&' . $ent . ';';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $escaped, _wp_specialchars( $ent ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $escaped, _wp_specialchars( $ent ) );

</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">        function test_optionally_escapes_quotes() {

</span><span class="cx" style="display: block; padding: 0 10px">                $source = "\"'hello!'\"";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '"&#039;hello!&#039;"', _wp_specialchars( $source, 'single' ) );

-               $this->assertEquals( "&quot;'hello!'&quot;", _wp_specialchars( $source, 'double' ) );

-               $this->assertEquals( '&quot;&#039;hello!&#039;&quot;', _wp_specialchars( $source, true ) );

-               $this->assertEquals( $source, _wp_specialchars( $source ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '"&#039;hello!&#039;"', _wp_specialchars( $source, 'single' ) );

+               $this->assertSame( "&quot;'hello!'&quot;", _wp_specialchars( $source, 'double' ) );

+               $this->assertSame( '&quot;&#039;hello!&#039;&quot;', _wp_specialchars( $source, true ) );

+               $this->assertSame( $source, _wp_specialchars( $source ) );

</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">@@ -51,7 +51,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_double_encoding

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_double_encoding( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, _wp_specialchars( $input, ENT_NOQUOTES, false, true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, _wp_specialchars( $input, ENT_NOQUOTES, false, true ) );

</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 data_double_encoding() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_no_double_encoding

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_no_double_encoding( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, _wp_specialchars( $input, ENT_NOQUOTES, false, false ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, _wp_specialchars( $input, ENT_NOQUOTES, false, false ) );

</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 data_no_double_encoding() {

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingWPStripAllTagsphp"></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/WPStripAllTags.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPStripAllTags.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WPStripAllTags.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,25 +9,25 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_strip_all_tags() {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $text = 'lorem<br />ipsum';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'loremipsum', wp_strip_all_tags( $text ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'loremipsum', wp_strip_all_tags( $text ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $text = "lorem<br />\nipsum";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "lorem\nipsum", wp_strip_all_tags( $text ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "lorem\nipsum", wp_strip_all_tags( $text ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test removing breaks is working.

</span><span class="cx" style="display: block; padding: 0 10px">                $text = 'lorem<br />ipsum';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'loremipsum', wp_strip_all_tags( $text, true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'loremipsum', wp_strip_all_tags( $text, true ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test script / style tag's contents is removed.

</span><span class="cx" style="display: block; padding: 0 10px">                $text = 'lorem<script>alert(document.cookie)</script>ipsum';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'loremipsum', wp_strip_all_tags( $text ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'loremipsum', wp_strip_all_tags( $text ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $text = "lorem<style>* { display: 'none' }</style>ipsum";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'loremipsum', wp_strip_all_tags( $text ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'loremipsum', wp_strip_all_tags( $text ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test "marlformed" markup of contents.

</span><span class="cx" style="display: block; padding: 0 10px">                $text = "lorem<style>* { display: 'none' }<script>alert( document.cookie )</script></style>ipsum";

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'loremipsum', wp_strip_all_tags( $text ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'loremipsum', wp_strip_all_tags( $text ) );

</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="trunktestsphpunittestsformattingWPTargetedLinkRelphp"></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/WPTargetedLinkRel.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,61 +9,61 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_add_to_links_with_target_blank() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>Links: <a href="/" target="_blank">No rel</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Links: <a href="/" target="_blank" rel="noopener noreferrer">No rel</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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_add_to_links_with_target_foo() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>Links: <a href="/" target="foo">No rel</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Links: <a href="/" target="foo" rel="noopener noreferrer">No rel</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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_target_as_first_attribute() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>Links: <a target="_blank" href="#">No rel</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Links: <a target="_blank" href="#" rel="noopener noreferrer">No rel</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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_add_to_existing_rel() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>Links: <a href="/" rel="existing values" target="_blank">Existing rel</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Links: <a href="/" rel="existing values noopener noreferrer" target="_blank">Existing rel</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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_no_duplicate_values_added() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>Links: <a href="/" rel="existing noopener values" target="_blank">Existing rel</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Links: <a href="/" rel="existing noopener values noreferrer" target="_blank">Existing rel</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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_rel_with_single_quote_delimiter() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>Links: <a href="/" rel=\'existing values\' target="_blank">Existing rel</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Links: <a href="/" rel="existing values noopener noreferrer" target="_blank">Existing rel</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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_rel_with_no_delimiter() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>Links: <a href="/" rel=existing target="_blank">Existing rel</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Links: <a href="/" rel="existing noopener noreferrer" target="_blank">Existing rel</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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_rel_value_spaced_and_no_delimiter() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>Links: <a href="/" rel = existing target="_blank">Existing rel</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Links: <a href="/" rel="existing noopener noreferrer" target="_blank">Existing rel</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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_escaped_quotes() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>Links: <a href=\"/\" rel=\"existing values\" target=\"_blank\">Existing rel</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Links: <a href=\"/\" rel=\"existing values noopener noreferrer\" target=\"_blank\">Existing rel</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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_ignore_links_with_no_target() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>Links: <a href="/" target="_blank">Change me</a> <a href="/">Do not change me</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Links: <a href="/" target="_blank" rel="noopener noreferrer">Change me</a> <a href="/">Do not change me</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'wp_targeted_link_rel', '__return_empty_string' );

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>Links: <a href="/" target="_blank">Do not change me</a></p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Links: <a href="/" target="_blank">Do not change me</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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">                        )

</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->assertEquals( $expected, $post->post_content );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $post->post_content );

</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">@@ -104,7 +104,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_targeted_link_rel_should_preserve_json() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<p>Links: <a href=\"\/\" target=\"_blank\">No rel<\/a><\/p>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Links: <a href=\"\/\" target=\"_blank\" rel=\"noopener noreferrer\">No rel<\/a><\/p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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">@@ -115,7 +115,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_targeted_link_rel_skips_style_and_scripts() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = '<style><a href="/" target=a></style><p>Links: <script>console.log("<a href=\'/\' target=a>hi</a>");</script><script>alert(1);</script>here <a href="/" target=_blank>aq</a></p><script>console.log("<a href=\'last\' target=\'_blank\'")</script>';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<style><a href="/" target=a></style><p>Links: <script>console.log("<a href=\'/\' target=a>hi</a>");</script><script>alert(1);</script>here <a href="/" target="_blank" rel="noopener noreferrer">aq</a></p><script>console.log("<a href=\'last\' target=\'_blank\'")</script>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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">@@ -126,13 +126,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_ignore_entirely_serialized_content() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = 'a:1:{s:4:"html";s:52:"<p>Links: <a href="/" target="_blank">No Rel</a></p>";}';

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = 'a:1:{s:4:"html";s:52:"<p>Links: <a href="/" target="_blank">No Rel</a></p>";}';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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_targeted_link_rel_tab_separated_values_are_split() {

</span><span class="cx" style="display: block; padding: 0 10px">                $content  = "<p>Links: <a href=\"/\" target=\"_blank\" rel=\"ugc\t\tnoopener\t\">No rel</a></p>";

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = '<p>Links: <a href="/" target="_blank" rel="ugc noopener noreferrer">No rel</a></p>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_targeted_link_rel( $content ) );

</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="trunktestsphpunittestsformattingWPTexturizephp"></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/WPTexturize.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPTexturize.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WPTexturize.php        2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,30 +5,30 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_WPTexturize extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function test_dashes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Hey &#8212; boo?', wptexturize( 'Hey -- boo?' ) );

-               $this->assertEquals( '<a href="http://xx--xx">Hey &#8212; boo?</a>', wptexturize( '<a href="http://xx--xx">Hey -- boo?</a>' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Hey &#8212; boo?', wptexturize( 'Hey -- boo?' ) );

+               $this->assertSame( '<a href="http://xx--xx">Hey &#8212; boo?</a>', wptexturize( '<a href="http://xx--xx">Hey -- boo?</a>' ) );

</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_disable() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '<pre>---&</pre>', wptexturize( '<pre>---&</pre>' ) );

-               $this->assertEquals( '<pre><code></code>--&</pre>', wptexturize( '<pre><code></code>--&</pre>' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '<pre>---&</pre>', wptexturize( '<pre>---&</pre>' ) );

+               $this->assertSame( '<pre><code></code>--&</pre>', wptexturize( '<pre><code></code>--&</pre>' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '<code>---&</code>', wptexturize( '<code>---&</code>' ) );

-               $this->assertEquals( '<kbd>---&</kbd>', wptexturize( '<kbd>---&</kbd>' ) );

-               $this->assertEquals( '<style>---&</style>', wptexturize( '<style>---&</style>' ) );

-               $this->assertEquals( '<script>---&</script>', wptexturize( '<script>---&</script>' ) );

-               $this->assertEquals( '<tt>---&</tt>', wptexturize( '<tt>---&</tt>' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '<code>---&</code>', wptexturize( '<code>---&</code>' ) );

+               $this->assertSame( '<kbd>---&</kbd>', wptexturize( '<kbd>---&</kbd>' ) );

+               $this->assertSame( '<style>---&</style>', wptexturize( '<style>---&</style>' ) );

+               $this->assertSame( '<script>---&</script>', wptexturize( '<script>---&</script>' ) );

+               $this->assertSame( '<tt>---&</tt>', wptexturize( '<tt>---&</tt>' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '<code>href="baba"</code> &#8220;baba&#8221;', wptexturize( '<code>href="baba"</code> "baba"' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '<code>href="baba"</code> &#8220;baba&#8221;', wptexturize( '<code>href="baba"</code> "baba"' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $enabled_tags_inside_code = '<code>curl -s <a href="http://x/">baba</a> | grep sfive | cut -d "\"" -f 10 &gt; topmp3.txt</code>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $enabled_tags_inside_code, wptexturize( $enabled_tags_inside_code ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $enabled_tags_inside_code, wptexturize( $enabled_tags_inside_code ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $double_nest = '<pre>"baba"<code>"baba"<pre></pre></code>"baba"</pre>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $double_nest, wptexturize( $double_nest ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $double_nest, wptexturize( $double_nest ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $invalid_nest = '<pre></code>"baba"</pre>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $invalid_nest, wptexturize( $invalid_nest ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $invalid_nest, wptexturize( $invalid_nest ) );

</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">@@ -36,9 +36,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 1418

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_bracketed_quotes_1418() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '(&#8220;test&#8221;)', wptexturize( '("test")' ) );

-               $this->assertEquals( '(&#8216;test&#8217;)', wptexturize( "('test')" ) );

-               $this->assertEquals( '(&#8217;twas)', wptexturize( "('twas)" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '(&#8220;test&#8221;)', wptexturize( '("test")' ) );

+               $this->assertSame( '(&#8216;test&#8217;)', wptexturize( "('test')" ) );

+               $this->assertSame( '(&#8217;twas)', wptexturize( "('twas)" ) );

</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">@@ -45,7 +45,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 3810

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_bracketed_quotes_3810() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'A dog (&#8220;Hubertus&#8221;) was sent out.', wptexturize( 'A dog ("Hubertus") was sent out.' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'A dog (&#8220;Hubertus&#8221;) was sent out.', wptexturize( 'A dog ("Hubertus") was sent out.' ) );

</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">@@ -52,22 +52,22 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 4539

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_basic_quotes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'test&#8217;s', wptexturize( 'test\'s' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'test&#8217;s', wptexturize( 'test\'s' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&#8216;quoted&#8217;', wptexturize( '\'quoted\'' ) );

-               $this->assertEquals( '&#8220;quoted&#8221;', wptexturize( '"quoted"' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&#8216;quoted&#8217;', wptexturize( '\'quoted\'' ) );

+               $this->assertSame( '&#8220;quoted&#8221;', wptexturize( '"quoted"' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'space before &#8216;quoted&#8217; space after', wptexturize( 'space before \'quoted\' space after' ) );

-               $this->assertEquals( 'space before &#8220;quoted&#8221; space after', wptexturize( 'space before "quoted" space after' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'space before &#8216;quoted&#8217; space after', wptexturize( 'space before \'quoted\' space after' ) );

+               $this->assertSame( 'space before &#8220;quoted&#8221; space after', wptexturize( 'space before "quoted" space after' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '(&#8216;quoted&#8217;)', wptexturize( '(\'quoted\')' ) );

-               $this->assertEquals( '{&#8220;quoted&#8221;}', wptexturize( '{"quoted"}' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '(&#8216;quoted&#8217;)', wptexturize( '(\'quoted\')' ) );

+               $this->assertSame( '{&#8220;quoted&#8221;}', wptexturize( '{"quoted"}' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&#8216;qu(ot)ed&#8217;', wptexturize( '\'qu(ot)ed\'' ) );

-               $this->assertEquals( '&#8220;qu{ot}ed&#8221;', wptexturize( '"qu{ot}ed"' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&#8216;qu(ot)ed&#8217;', wptexturize( '\'qu(ot)ed\'' ) );

+               $this->assertSame( '&#8220;qu{ot}ed&#8221;', wptexturize( '"qu{ot}ed"' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( ' &#8216;test&#8217;s quoted&#8217; ', wptexturize( ' \'test\'s quoted\' ' ) );

-               $this->assertEquals( ' &#8220;test&#8217;s quoted&#8221; ', wptexturize( ' "test\'s quoted" ' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( ' &#8216;test&#8217;s quoted&#8217; ', wptexturize( ' \'test\'s quoted\' ' ) );

+               $this->assertSame( ' &#8220;test&#8217;s quoted&#8221; ', wptexturize( ' "test\'s quoted" ' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 15241

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_full_sentences_with_unmatched_single_quotes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         'That means every moment you&#8217;re working on something without it being in the public it&#8217;s actually dying.',

</span><span class="cx" style="display: block; padding: 0 10px">                        wptexturize( "That means every moment you're working on something without it being in the public it's actually dying." )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,19 +85,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 4539

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_quotes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&#8220;Quoted String&#8221;', wptexturize( '"Quoted String"' ) );

-               // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"' ) );

-               // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link and a period</a>&#8221;.', wptexturize( 'Here is "<a href="http://example.com">a test with a link and a period</a>".' ) );

-               $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221; and a space.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>" and a space.' ) );

-               $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a> and some text quoted&#8221;', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a> and some text quoted"' ) );

-               // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;, and a comma.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>", and a comma.' ) );

-               // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;; and a semi-colon.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"; and a semi-colon.' ) );

-               // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;- and a dash.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"- and a dash.' ) );

-               // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;&#8230; and ellipses.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"... and ellipses.' ) );

-               // $this->assertEquals( 'Here is &#8220;a test <a href="http://example.com">with a link</a>&#8221;.', wptexturize( 'Here is "a test <a href="http://example.com">with a link</a>".' ) );

-               // $this->assertEquals( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;and a work stuck to the end.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"and a work stuck to the end.' ) );

-               $this->assertEquals( 'A test with a finishing number, &#8220;like 23&#8221;.', wptexturize( 'A test with a finishing number, "like 23".' ) );

-               $this->assertEquals( 'A test with a number, &#8220;like 62&#8221;, is nice to have.', wptexturize( 'A test with a number, "like 62", is nice to have.' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&#8220;Quoted String&#8221;', wptexturize( '"Quoted String"' ) );

+               // $this->assertSame( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"' ) );

+               // $this->assertSame( 'Here is &#8220;<a href="http://example.com">a test with a link and a period</a>&#8221;.', wptexturize( 'Here is "<a href="http://example.com">a test with a link and a period</a>".' ) );

+               $this->assertSame( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221; and a space.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>" and a space.' ) );

+               $this->assertSame( 'Here is &#8220;<a href="http://example.com">a test with a link</a> and some text quoted&#8221;', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a> and some text quoted"' ) );

+               // $this->assertSame( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;, and a comma.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>", and a comma.' ) );

+               // $this->assertSame( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;; and a semi-colon.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"; and a semi-colon.' ) );

+               // $this->assertSame( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;- and a dash.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"- and a dash.' ) );

+               // $this->assertSame( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;&#8230; and ellipses.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"... and ellipses.' ) );

+               // $this->assertSame( 'Here is &#8220;a test <a href="http://example.com">with a link</a>&#8221;.', wptexturize( 'Here is "a test <a href="http://example.com">with a link</a>".' ) );

+               // $this->assertSame( 'Here is &#8220;<a href="http://example.com">a test with a link</a>&#8221;and a work stuck to the end.', wptexturize( 'Here is "<a href="http://example.com">a test with a link</a>"and a work stuck to the end.' ) );

+               $this->assertSame( 'A test with a finishing number, &#8220;like 23&#8221;.', wptexturize( 'A test with a finishing number, "like 23".' ) );

+               $this->assertSame( 'A test with a number, &#8220;like 62&#8221;, is nice to have.', wptexturize( 'A test with a number, "like 62", is nice to have.' ) );

</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">@@ -104,11 +104,11 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 4539

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_quotes_before_s() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'test&#8217;s', wptexturize( "test's" ) );

-               $this->assertEquals( '&#8216;test&#8217;s', wptexturize( "'test's" ) );

-               $this->assertEquals( '&#8216;test&#8217;s&#8217;', wptexturize( "'test's'" ) );

-               $this->assertEquals( '&#8216;string&#8217;', wptexturize( "'string'" ) );

-               $this->assertEquals( '&#8216;string&#8217;s&#8217;', wptexturize( "'string's'" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'test&#8217;s', wptexturize( "test's" ) );

+               $this->assertSame( '&#8216;test&#8217;s', wptexturize( "'test's" ) );

+               $this->assertSame( '&#8216;test&#8217;s&#8217;', wptexturize( "'test's'" ) );

+               $this->assertSame( '&#8216;string&#8217;', wptexturize( "'string'" ) );

+               $this->assertSame( '&#8216;string&#8217;s&#8217;', wptexturize( "'string's'" ) );

</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">@@ -115,34 +115,34 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 4539

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_quotes_before_numbers() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Class of &#8217;99', wptexturize( "Class of '99" ) );

-               $this->assertEquals( 'Class of &#8217;99&#8217;s', wptexturize( "Class of '99's" ) );

-               $this->assertEquals( '&#8216;Class of &#8217;99&#8217;', wptexturize( "'Class of '99'" ) );

-               $this->assertEquals( '&#8216;Class of &#8217;99&#8217; ', wptexturize( "'Class of '99' " ) );

-               $this->assertEquals( '&#8216;Class of &#8217;99&#8217;.', wptexturize( "'Class of '99'." ) );

-               $this->assertEquals( '&#8216;Class of &#8217;99&#8217;, she said', wptexturize( "'Class of '99', she said" ) );

-               $this->assertEquals( '&#8216;Class of &#8217;99&#8217;:', wptexturize( "'Class of '99':" ) );

-               $this->assertEquals( '&#8216;Class of &#8217;99&#8217;;', wptexturize( "'Class of '99';" ) );

-               $this->assertEquals( '&#8216;Class of &#8217;99&#8217;!', wptexturize( "'Class of '99'!" ) );

-               $this->assertEquals( '&#8216;Class of &#8217;99&#8217;?', wptexturize( "'Class of '99'?" ) );

-               $this->assertEquals( '&#8216;Class of &#8217;99&#8217;s&#8217;', wptexturize( "'Class of '99's'" ) );

-               $this->assertEquals( '&#8216;Class of &#8217;99&#8217;s&#8217;', wptexturize( "'Class of '99&#8217;s'" ) );

-               $this->assertEquals( '&#8220;Class of 99&#8221;', wptexturize( '"Class of 99"' ) );

-               $this->assertEquals( '&#8220;Class of &#8217;99&#8221;', wptexturize( "\"Class of '99\"" ) );

-               $this->assertEquals( '{&#8220;Class of &#8217;99&#8221;}', wptexturize( "{\"Class of '99\"}" ) );

-               $this->assertEquals( ' &#8220;Class of &#8217;99&#8221; ', wptexturize( " \"Class of '99\" " ) );

-               $this->assertEquals( ' &#8220;Class of &#8217;99&#8221;.', wptexturize( " \"Class of '99\"." ) );

-               $this->assertEquals( ' &#8220;Class of &#8217;99&#8221;, she said', wptexturize( " \"Class of '99\", she said" ) );

-               $this->assertEquals( ' &#8220;Class of &#8217;99&#8221;:', wptexturize( " \"Class of '99\":" ) );

-               $this->assertEquals( ' &#8220;Class of &#8217;99&#8221;;', wptexturize( " \"Class of '99\";" ) );

-               $this->assertEquals( ' &#8220;Class of &#8217;99&#8221;!', wptexturize( " \"Class of '99\"!" ) );

-               $this->assertEquals( ' &#8220;Class of &#8217;99&#8221;?', wptexturize( " \"Class of '99\"?" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Class of &#8217;99', wptexturize( "Class of '99" ) );

+               $this->assertSame( 'Class of &#8217;99&#8217;s', wptexturize( "Class of '99's" ) );

+               $this->assertSame( '&#8216;Class of &#8217;99&#8217;', wptexturize( "'Class of '99'" ) );

+               $this->assertSame( '&#8216;Class of &#8217;99&#8217; ', wptexturize( "'Class of '99' " ) );

+               $this->assertSame( '&#8216;Class of &#8217;99&#8217;.', wptexturize( "'Class of '99'." ) );

+               $this->assertSame( '&#8216;Class of &#8217;99&#8217;, she said', wptexturize( "'Class of '99', she said" ) );

+               $this->assertSame( '&#8216;Class of &#8217;99&#8217;:', wptexturize( "'Class of '99':" ) );

+               $this->assertSame( '&#8216;Class of &#8217;99&#8217;;', wptexturize( "'Class of '99';" ) );

+               $this->assertSame( '&#8216;Class of &#8217;99&#8217;!', wptexturize( "'Class of '99'!" ) );

+               $this->assertSame( '&#8216;Class of &#8217;99&#8217;?', wptexturize( "'Class of '99'?" ) );

+               $this->assertSame( '&#8216;Class of &#8217;99&#8217;s&#8217;', wptexturize( "'Class of '99's'" ) );

+               $this->assertSame( '&#8216;Class of &#8217;99&#8217;s&#8217;', wptexturize( "'Class of '99&#8217;s'" ) );

+               $this->assertSame( '&#8220;Class of 99&#8221;', wptexturize( '"Class of 99"' ) );

+               $this->assertSame( '&#8220;Class of &#8217;99&#8221;', wptexturize( "\"Class of '99\"" ) );

+               $this->assertSame( '{&#8220;Class of &#8217;99&#8221;}', wptexturize( "{\"Class of '99\"}" ) );

+               $this->assertSame( ' &#8220;Class of &#8217;99&#8221; ', wptexturize( " \"Class of '99\" " ) );

+               $this->assertSame( ' &#8220;Class of &#8217;99&#8221;.', wptexturize( " \"Class of '99\"." ) );

+               $this->assertSame( ' &#8220;Class of &#8217;99&#8221;, she said', wptexturize( " \"Class of '99\", she said" ) );

+               $this->assertSame( ' &#8220;Class of &#8217;99&#8221;:', wptexturize( " \"Class of '99\":" ) );

+               $this->assertSame( ' &#8220;Class of &#8217;99&#8221;;', wptexturize( " \"Class of '99\";" ) );

+               $this->assertSame( ' &#8220;Class of &#8217;99&#8221;!', wptexturize( " \"Class of '99\"!" ) );

+               $this->assertSame( ' &#8220;Class of &#8217;99&#8221;?', wptexturize( " \"Class of '99\"?" ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Not a quotation, may be between two other quotations.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '}&#8221;Class of &#8217;99&#8243;{', wptexturize( "}\"Class of '99\"{" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '}&#8221;Class of &#8217;99&#8243;{', wptexturize( "}\"Class of '99\"{" ) );

</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_quotes_after_numbers() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'Class of &#8217;99', wptexturize( "Class of '99" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'Class of &#8217;99', wptexturize( "Class of '99" ) );

</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">@@ -150,24 +150,24 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 15241

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_other_html() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&#8216;<strong>', wptexturize( "'<strong>" ) );

-               // $this->assertEquals( '&#8216;<strong>Quoted Text</strong>&#8217;,', wptexturize( "'<strong>Quoted Text</strong>'," ) );

-               // $this->assertEquals( '&#8220;<strong>Quoted Text</strong>&#8221;,', wptexturize( '"<strong>Quoted Text</strong>",' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&#8216;<strong>', wptexturize( "'<strong>" ) );

+               // $this->assertSame( '&#8216;<strong>Quoted Text</strong>&#8217;,', wptexturize( "'<strong>Quoted Text</strong>'," ) );

+               // $this->assertSame( '&#8220;<strong>Quoted Text</strong>&#8221;,', wptexturize( '"<strong>Quoted Text</strong>",' ) );

</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_x() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '14&#215;24', wptexturize( '14x24' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '14&#215;24', wptexturize( '14x24' ) );

</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_minutes_seconds() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '9&#8242;', wptexturize( '9\'' ) );

-               $this->assertEquals( '9&#8243;', wptexturize( '9"' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '9&#8242;', wptexturize( '9\'' ) );

+               $this->assertSame( '9&#8243;', wptexturize( '9"' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'a 9&#8242; b', wptexturize( 'a 9\' b' ) );

-               $this->assertEquals( 'a 9&#8243; b', wptexturize( 'a 9" b' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'a 9&#8242; b', wptexturize( 'a 9\' b' ) );

+               $this->assertSame( 'a 9&#8243; b', wptexturize( 'a 9" b' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&#8220;a 9&#8242; b&#8221;', wptexturize( '"a 9\' b"' ) );

-               $this->assertEquals( '&#8216;a 9&#8243; b&#8217;', wptexturize( "'a 9\" b'" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&#8220;a 9&#8242; b&#8221;', wptexturize( '"a 9\' b"' ) );

+               $this->assertSame( '&#8216;a 9&#8243; b&#8217;', wptexturize( "'a 9\" b'" ) );

</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">@@ -174,10 +174,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 8775

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wptexturize_quotes_around_numbers() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&#8220;12345&#8221;', wptexturize( '"12345"' ) );

-               $this->assertEquals( '&#8216;12345&#8217;', wptexturize( '\'12345\'' ) );

-               $this->assertEquals( '&#8220;a 9&#8242; plus a &#8216;9&#8217;, maybe a 9&#8242; &#8216;9&#8217;&#8221;', wptexturize( '"a 9\' plus a \'9\', maybe a 9\' \'9\'"' ) );

-               $this->assertEquals( '<p>&#8217;99<br />&#8216;123&#8217;<br />&#8217;tis<br />&#8216;s&#8217;</p>', wptexturize( '<p>\'99<br />\'123\'<br />\'tis<br />\'s\'</p>' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&#8220;12345&#8221;', wptexturize( '"12345"' ) );

+               $this->assertSame( '&#8216;12345&#8217;', wptexturize( '\'12345\'' ) );

+               $this->assertSame( '&#8220;a 9&#8242; plus a &#8216;9&#8217;, maybe a 9&#8242; &#8216;9&#8217;&#8221;', wptexturize( '"a 9\' plus a \'9\', maybe a 9\' \'9\'"' ) );

+               $this->assertSame( '<p>&#8217;99<br />&#8216;123&#8217;<br />&#8217;tis<br />&#8216;s&#8217;</p>', wptexturize( '<p>\'99<br />\'123\'<br />\'tis<br />\'s\'</p>' ) );

</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">@@ -184,9 +184,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 8912

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wptexturize_html_comments() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '<!--[if !IE]>--><!--<![endif]-->', wptexturize( '<!--[if !IE]>--><!--<![endif]-->' ) );

-               $this->assertEquals( '<!--[if !IE]>"a 9\' plus a \'9\', maybe a 9\' \'9\' "<![endif]-->', wptexturize( '<!--[if !IE]>"a 9\' plus a \'9\', maybe a 9\' \'9\' "<![endif]-->' ) );

-               $this->assertEquals( '<ul><li>Hello.</li><!--<li>Goodbye.</li>--></ul>', wptexturize( '<ul><li>Hello.</li><!--<li>Goodbye.</li>--></ul>' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '<!--[if !IE]>--><!--<![endif]-->', wptexturize( '<!--[if !IE]>--><!--<![endif]-->' ) );

+               $this->assertSame( '<!--[if !IE]>"a 9\' plus a \'9\', maybe a 9\' \'9\' "<![endif]-->', wptexturize( '<!--[if !IE]>"a 9\' plus a \'9\', maybe a 9\' \'9\' "<![endif]-->' ) );

+               $this->assertSame( '<ul><li>Hello.</li><!--<li>Goodbye.</li>--></ul>', wptexturize( '<ul><li>Hello.</li><!--<li>Goodbye.</li>--></ul>' ) );

</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">@@ -194,8 +194,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 15241

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_entity_quote_cuddling() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&nbsp;&#8220;Testing&#8221;', wptexturize( '&nbsp;"Testing"' ) );

-               // $this->assertEquals( '&#38;&#8220;Testing&#8221;', wptexturize( '&#38;"Testing"' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&nbsp;&#8220;Testing&#8221;', wptexturize( '&nbsp;"Testing"' ) );

+               // $this->assertSame( '&#38;&#8220;Testing&#8221;', wptexturize( '&#38;"Testing"' ) );

</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">@@ -202,7 +202,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 22823

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_apostrophes_before_primes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'WordPress 3.5&#8217;s release date', wptexturize( "WordPress 3.5's release date" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'WordPress 3.5&#8217;s release date', wptexturize( "WordPress 3.5's release date" ) );

</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">@@ -211,21 +211,21 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_spaces_around_hyphens() {

</span><span class="cx" style="display: block; padding: 0 10px">                $nbsp = "\xC2\xA0";

</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->assertEquals( ' &#8211; ', wptexturize( ' - ' ) );

-               $this->assertEquals( '&nbsp;&#8211;&nbsp;', wptexturize( '&nbsp;-&nbsp;' ) );

-               $this->assertEquals( ' &#8211;&nbsp;', wptexturize( ' -&nbsp;' ) );

-               $this->assertEquals( '&nbsp;&#8211; ', wptexturize( '&nbsp;- ' ) );

-               $this->assertEquals( "$nbsp&#8211;$nbsp", wptexturize( "$nbsp-$nbsp" ) );

-               $this->assertEquals( " &#8211;$nbsp", wptexturize( " -$nbsp" ) );

-               $this->assertEquals( "$nbsp&#8211; ", wptexturize( "$nbsp- " ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( ' &#8211; ', wptexturize( ' - ' ) );

+               $this->assertSame( '&nbsp;&#8211;&nbsp;', wptexturize( '&nbsp;-&nbsp;' ) );

+               $this->assertSame( ' &#8211;&nbsp;', wptexturize( ' -&nbsp;' ) );

+               $this->assertSame( '&nbsp;&#8211; ', wptexturize( '&nbsp;- ' ) );

+               $this->assertSame( "$nbsp&#8211;$nbsp", wptexturize( "$nbsp-$nbsp" ) );

+               $this->assertSame( " &#8211;$nbsp", wptexturize( " -$nbsp" ) );

+               $this->assertSame( "$nbsp&#8211; ", wptexturize( "$nbsp- " ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( ' &#8212; ', wptexturize( ' -- ' ) );

-               $this->assertEquals( '&nbsp;&#8212;&nbsp;', wptexturize( '&nbsp;--&nbsp;' ) );

-               $this->assertEquals( ' &#8212;&nbsp;', wptexturize( ' --&nbsp;' ) );

-               $this->assertEquals( '&nbsp;&#8212; ', wptexturize( '&nbsp;-- ' ) );

-               $this->assertEquals( "$nbsp&#8212;$nbsp", wptexturize( "$nbsp--$nbsp" ) );

-               $this->assertEquals( " &#8212;$nbsp", wptexturize( " --$nbsp" ) );

-               $this->assertEquals( "$nbsp&#8212; ", wptexturize( "$nbsp-- " ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( ' &#8212; ', wptexturize( ' -- ' ) );

+               $this->assertSame( '&nbsp;&#8212;&nbsp;', wptexturize( '&nbsp;--&nbsp;' ) );

+               $this->assertSame( ' &#8212;&nbsp;', wptexturize( ' --&nbsp;' ) );

+               $this->assertSame( '&nbsp;&#8212; ', wptexturize( '&nbsp;-- ' ) );

+               $this->assertSame( "$nbsp&#8212;$nbsp", wptexturize( "$nbsp--$nbsp" ) );

+               $this->assertSame( " &#8212;$nbsp", wptexturize( " --$nbsp" ) );

+               $this->assertSame( "$nbsp&#8212; ", wptexturize( "$nbsp-- " ) );

</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">@@ -232,13 +232,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 31030

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_hyphens_at_start_and_end() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&#8211; ', wptexturize( '- ' ) );

-               $this->assertEquals( '&#8211; &#8211;', wptexturize( '- -' ) );

-               $this->assertEquals( ' &#8211;', wptexturize( ' -' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&#8211; ', wptexturize( '- ' ) );

+               $this->assertSame( '&#8211; &#8211;', wptexturize( '- -' ) );

+               $this->assertSame( ' &#8211;', wptexturize( ' -' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&#8212; ', wptexturize( '-- ' ) );

-               $this->assertEquals( '&#8212; &#8212;', wptexturize( '-- --' ) );

-               $this->assertEquals( ' &#8212;', wptexturize( ' --' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&#8212; ', wptexturize( '-- ' ) );

+               $this->assertSame( '&#8212; &#8212;', wptexturize( '-- --' ) );

+               $this->assertSame( ' &#8212;', wptexturize( ' --' ) );

</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">@@ -266,7 +266,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_spaces_around_quotes

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_spaces_around_quotes( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_spaces_around_quotes() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +322,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_apos_before_digits

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_apos_before_digits( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_apos_before_digits() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,7 +363,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_opening_single_quote

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_opening_single_quote( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_opening_single_quote() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,7 +492,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_double_prime

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_double_prime( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_double_prime() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,7 +525,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_single_prime

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_single_prime( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_single_prime() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,7 +558,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_contractions

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_contractions( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_contractions() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,7 +599,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_opening_quote

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_opening_quote( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_opening_quote() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,7 +676,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_closing_quote

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_closing_quote( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_closing_quote() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -765,7 +765,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_closing_single_quote

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_closing_single_quote( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_closing_single_quote() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -855,7 +855,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_multiplication

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_multiplication( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_multiplication() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -905,7 +905,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_ampersand

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_ampersand( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_ampersand() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -970,7 +970,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_cockney

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_cockney( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_cockney() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1031,7 +1031,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_smart_dashes

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_smart_dashes( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_smart_dashes() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1084,7 +1084,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_misc_static_replacements

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_misc_static_replacements( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_misc_static_replacements() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1139,7 +1139,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_quoted_numbers

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_quoted_numbers( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_quoted_numbers() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1190,7 +1190,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_quotes_and_dashes

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_quotes_and_dashes( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_quotes_and_dashes() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1253,7 +1253,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_tag_avoidance

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_tag_avoidance( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_tag_avoidance() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1476,7 +1476,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_year_abbr

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_year_abbr( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_year_abbr() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1572,7 +1572,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'gettext_with_context', array( $this, 'filter_translate' ), 10, 4 );

</span><span class="cx" style="display: block; padding: 0 10px">                wptexturize( 'reset', 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">-                return $this->assertEquals( $output, $result );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, $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">        function filter_translate( $translations, $text, $context, $domain ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1792,7 +1792,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_element_stack

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_element_stack( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_element_stack() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1845,7 +1845,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_unregistered_shortcodes( $input, $output ) {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'no_texturize_shortcodes', array( $this, 'filter_shortcodes' ), 10, 1 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $output = $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $output = $this->assertSame( $output, wptexturize( $input ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'no_texturize_shortcodes', array( $this, 'filter_shortcodes' ), 10, 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                return $output;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1928,7 +1928,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_primes_vs_quotes

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_primes_vs_quotes( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wptexturize( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wptexturize( $input ) );

</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 data_primes_vs_quotes() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1997,7 +1997,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'gettext_with_context', array( $this, 'filter_translate2' ), 10, 4 );

</span><span class="cx" style="display: block; padding: 0 10px">                wptexturize( 'reset', 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">-                return $this->assertEquals( $output, $result );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, $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">        function filter_translate2( $translations, $text, $context, $domain ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2103,7 +2103,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 35864

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_trailing_less_than() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'F&#8211;oo<', wptexturize( 'F--oo<', true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'F&#8211;oo<', wptexturize( 'F--oo<', true ) );

</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 data_whole_posts() {

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingWPTrimWordsphp"></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/WPTrimWords.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPTrimWords.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WPTrimWords.php        2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,23 +16,23 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_trims_to_55_by_default() {

</span><span class="cx" style="display: block; padding: 0 10px">                $trimmed = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce varius lacinia vehicula. Etiam sapien risus, ultricies ac posuere eu, convallis sit amet augue. Pellentesque urna massa, lacinia vel iaculis eget, bibendum in mauris. Aenean eleifend pulvinar ligula, a convallis eros gravida non. Suspendisse potenti. Pellentesque et odio tortor. In vulputate pellentesque libero, sed dapibus velit&hellip;';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $trimmed, wp_trim_words( $this->long_text ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $trimmed, wp_trim_words( $this->long_text ) );

</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_trims_to_10() {

</span><span class="cx" style="display: block; padding: 0 10px">                $trimmed = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce varius&hellip;';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $trimmed, wp_trim_words( $this->long_text, 10 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $trimmed, wp_trim_words( $this->long_text, 10 ) );

</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_trims_to_5_and_uses_custom_more() {

</span><span class="cx" style="display: block; padding: 0 10px">                $trimmed = 'Lorem ipsum dolor sit amet,[...] Read on!';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $trimmed, wp_trim_words( $this->long_text, 5, '[...] Read on!' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $trimmed, wp_trim_words( $this->long_text, 5, '[...] Read on!' ) );

</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_strips_tags_before_trimming() {

</span><span class="cx" style="display: block; padding: 0 10px">                $text    = 'This text contains a <a href="http://wordpress.org"> link </a> to WordPress.org!';

</span><span class="cx" style="display: block; padding: 0 10px">                $trimmed = 'This text contains a link&hellip;';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $trimmed, wp_trim_words( $text, 5 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $trimmed, wp_trim_words( $text, 5 ) );

</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">@@ -42,15 +42,15 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $trimmed = 'This text contains. It should go.';

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $text = 'This text contains<script>alert(" Javascript");</script>. It should go.';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $trimmed, wp_trim_words( $text ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $trimmed, wp_trim_words( $text ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $text = 'This text contains<style>#css { width:expression(alert("css")) }</style>. It should go.';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $trimmed, wp_trim_words( $text ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $trimmed, wp_trim_words( $text ) );

</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_doesnt_trim_short_text() {

</span><span class="cx" style="display: block; padding: 0 10px">                $text = 'This is some short text.';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $text, wp_trim_words( $text ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $text, wp_trim_words( $text ) );

</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">@@ -61,7 +61,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = substr( $this->long_text, 0, 20 ) . '&hellip;';

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = wp_trim_words( $this->long_text, 20 );

</span><span class="cx" style="display: block; padding: 0 10px">                restore_previous_locale();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $expected = str_repeat( 'あ', 19 ) . '&hellip;';

</span><span class="cx" style="display: block; padding: 0 10px">                $actual   = wp_trim_words( $text, 19 );

</span><span class="cx" style="display: block; padding: 0 10px">                restore_previous_locale();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,9 +80,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 47867

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_works_with_non_numeric_num_words() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', wp_trim_words( $this->long_text, '', '' ) );

-               $this->assertEquals( '', wp_trim_words( $this->long_text, 'abc', '' ) );

-               $this->assertEquals( '', wp_trim_words( $this->long_text, null, '' ) );

-               $this->assertEquals( 'Lorem ipsum dolor', wp_trim_words( $this->long_text, '3', '' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', wp_trim_words( $this->long_text, '', '' ) );

+               $this->assertSame( '', wp_trim_words( $this->long_text, 'abc', '' ) );

+               $this->assertSame( '', wp_trim_words( $this->long_text, null, '' ) );

+               $this->assertSame( 'Lorem ipsum dolor', wp_trim_words( $this->long_text, '3', '' ) );

</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="trunktestsphpunittestsformattingWpHtmlEditPrephp"></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/WpHtmlEditPre.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WpHtmlEditPre.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WpHtmlEditPre.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_htmledit_pre_charset_iso_8859_1() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'pre_option_blog_charset', array( $this, '_charset_iso_8859_1' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $iso8859_1 = 'Fran' . chr( 135 ) . 'ais';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $iso8859_1, wp_htmledit_pre( $iso8859_1 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $iso8859_1, wp_htmledit_pre( $iso8859_1 ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'pre_option_blog_charset', array( $this, '_charset_iso_8859_1' ) );

</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">@@ -31,7 +31,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_htmledit_pre_charset_utf_8() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'pre_option_blog_charset', array( $this, '_charset_utf_8' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $utf8 = 'Fran' . chr( 195 ) . chr( 167 ) . 'ais';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $utf8, wp_htmledit_pre( $utf8 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $utf8, wp_htmledit_pre( $utf8 ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'pre_option_blog_charset', array( $this, '_charset_utf_8' ) );

</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="trunktestsphpunittestsformattingWpHtmlSplitphp"></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/WpHtmlSplit.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WpHtmlSplit.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WpHtmlSplit.php        2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_basic_features

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_basic_features( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wp_html_split( $input ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wp_html_split( $input ) );

</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 data_basic_features() {

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingWpReplaceInHtmlTagsphp"></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/WpReplaceInHtmlTags.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WpReplaceInHtmlTags.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WpReplaceInHtmlTags.php        2020-09-02 00:35:36 UTC (rev 48937)

</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">         * @dataProvider data_wp_replace_in_html_tags

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_replace_in_html_tags( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->assertEquals( $output, wp_replace_in_html_tags( $input, array( "\n" => ' ' ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $this->assertSame( $output, wp_replace_in_html_tags( $input, array( "\n" => ' ' ) ) );

</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 data_wp_replace_in_html_tags() {

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingWpRichEditPrephp"></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/WpRichEditPre.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WpRichEditPre.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/WpRichEditPre.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_richedit_pre_charset_iso_8859_1() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'pre_option_blog_charset', array( $this, '_charset_iso_8859_1' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $iso8859_1 = 'Fran' . chr( 135 ) . 'ais';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&lt;p&gt;' . $iso8859_1 . "&lt;/p&gt;\n", wp_richedit_pre( $iso8859_1 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&lt;p&gt;' . $iso8859_1 . "&lt;/p&gt;\n", wp_richedit_pre( $iso8859_1 ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'pre_option_blog_charset', array( $this, '_charset_iso_8859_1' ) );

</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">@@ -31,7 +31,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_richedit_pre_charset_utf_8() {

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'pre_option_blog_charset', array( $this, '_charset_utf_8' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $utf8 = 'Fran' . chr( 195 ) . chr( 167 ) . 'ais';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '&lt;p&gt;' . $utf8 . "&lt;/p&gt;\n", wp_richedit_pre( $utf8 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '&lt;p&gt;' . $utf8 . "&lt;/p&gt;\n", wp_richedit_pre( $utf8 ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'pre_option_blog_charset', array( $this, '_charset_utf_8' ) );

</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="trunktestsphpunittestsformattingZeroisephp"></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/Zeroise.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Zeroise.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/Zeroise.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,10 +5,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_Zeroise extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px">        function test_pads_with_leading_zeroes() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '00005', zeroise( 5, 5 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '00005', zeroise( 5, 5 ) );

</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_does_nothing_if_input_is_already_longer() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '5000000', zeroise( 5000000, 2 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '5000000', zeroise( 5000000, 2 ) );

</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="trunktestsphpunittestsformattingbalanceTagsphp"></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/balanceTags.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/balanceTags.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/balanceTags.php        2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_detects_traditional_tag_names( $tag ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $normalized = strtolower( $tag );

</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->assertEquals( "<$normalized>inside</$normalized>", balanceTags( "<$tag>inside", true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "<$normalized>inside</$normalized>", balanceTags( "<$tag>inside", true ) );

</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">@@ -162,7 +162,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider supported_custom_element_tag_names

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_detects_supported_custom_element_tag_names( $tag ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "<$tag>inside</$tag>", balanceTags( "<$tag>inside", true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "<$tag>inside</$tag>", balanceTags( "<$tag>inside", true ) );

</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">@@ -170,7 +170,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider invalid_tag_names

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_ignores_invalid_tag_names( $input, $output ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $output, balanceTags( $input, true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $output, balanceTags( $input, true ) );

</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">@@ -178,7 +178,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider unsupported_valid_tag_names

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_ignores_unsupported_custom_tag_names( $tag ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "<$tag>inside", balanceTags( "<$tag>inside", true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "<$tag>inside", balanceTags( "<$tag>inside", true ) );

</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">@@ -186,7 +186,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider supported_invalid_tag_names

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_detects_supported_invalid_tag_names( $tag ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "<$tag>inside</$tag>", balanceTags( "<$tag>inside", true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "<$tag>inside</$tag>", balanceTags( "<$tag>inside", true ) );

</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">@@ -196,7 +196,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider single_tags

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_selfcloses_unclosed_known_single_tags( $tag ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "<$tag />", balanceTags( "<$tag>", true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "<$tag />", balanceTags( "<$tag>", true ) );

</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">@@ -207,7 +207,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider single_tags

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_selfcloses_known_single_tags_having_closing_tag( $tag ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( "<$tag />", balanceTags( "<$tag></$tag>", true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( "<$tag />", balanceTags( "<$tag></$tag>", true ) );

</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">@@ -232,7 +232,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">                foreach ( $inputs as $key => $input ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</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">@@ -247,7 +247,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">                foreach ( $inputs as $key => $input ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</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">@@ -260,7 +260,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">                foreach ( $inputs as $key => $input ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $inputs[ $key ], balanceTags( $inputs[ $key ], true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $inputs[ $key ], balanceTags( $inputs[ $key ], true ) );

</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">@@ -280,7 +280,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">                foreach ( $inputs as $key => $input ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</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">@@ -294,7 +294,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">                foreach ( $inputs as $key => $input ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $inputs[ $key ], balanceTags( $inputs[ $key ], true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $inputs[ $key ], balanceTags( $inputs[ $key ], true ) );

</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">@@ -303,7 +303,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_allows_immediately_nested_object_tags() {

</span><span class="cx" style="display: block; padding: 0 10px">                $object = '<object id="obj1"><param name="param1"/><object id="obj2"><param name="param2"/></object></object>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $object, balanceTags( $object, true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $object, balanceTags( $object, true ) );

</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_balances_nested_non_nestable_tags() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,7 +317,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">                foreach ( $inputs as $key => $input ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</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">@@ -332,7 +332,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">                foreach ( $inputs as $key => $input ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</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">@@ -353,7 +353,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">                foreach ( $inputs as $key => $input ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</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">@@ -372,7 +372,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">                foreach ( $inputs as $key => $input ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected[ $key ], balanceTags( $inputs[ $key ], true ) );

</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">@@ -438,6 +438,6 @@

<span class="cx" style="display: block; padding: 0 10px">         * @param string $expected Expected.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_custom_elements( $source, $expected ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, balanceTags( $source, true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, balanceTags( $source, true ) );

</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="trunktestsphpunittestsformattingdatephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/date.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/date.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/date.php       2020-09-02 00:35:36 UTC (rev 48937)

</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">                update_option( 'timezone_string', 'Europe/London' );

</span><span class="cx" style="display: block; padding: 0 10px">                $local = '2012-01-01 12:34:56';

</span><span class="cx" style="display: block; padding: 0 10px">                $gmt   = $local;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $local, get_date_from_gmt( $gmt ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $local, get_date_from_gmt( $gmt ) );

</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">@@ -27,7 +27,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'timezone_string', 'Europe/London' );

</span><span class="cx" style="display: block; padding: 0 10px">                $gmt   = '2012-06-01 12:34:56';

</span><span class="cx" style="display: block; padding: 0 10px">                $local = '2012-06-01 13:34:56';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $local, get_date_from_gmt( $gmt ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $local, get_date_from_gmt( $gmt ) );

</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">@@ -37,7 +37,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'timezone_string', 'Europe/London' );

</span><span class="cx" style="display: block; padding: 0 10px">                $local = '2012-01-01 12:34:56';

</span><span class="cx" style="display: block; padding: 0 10px">                $gmt   = $local;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $gmt, get_gmt_from_date( $local ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $gmt, get_gmt_from_date( $local ) );

</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">@@ -47,7 +47,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'timezone_string', 'Europe/London' );

</span><span class="cx" style="display: block; padding: 0 10px">                $local = '2012-06-01 12:34:56';

</span><span class="cx" style="display: block; padding: 0 10px">                $gmt   = '2012-06-01 11:34:56';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $gmt, get_gmt_from_date( $local ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $gmt, get_gmt_from_date( $local ) );

</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">@@ -56,7 +56,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_date_and_time_from_gmt_no_timezone() {

</span><span class="cx" style="display: block; padding: 0 10px">                $local = '2012-01-01 12:34:56';

</span><span class="cx" style="display: block; padding: 0 10px">                $gmt   = $local;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $gmt, get_date_from_gmt( $local ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $gmt, get_date_from_gmt( $local ) );

</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">@@ -65,7 +65,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_get_gmt_from_date_no_timezone() {

</span><span class="cx" style="display: block; padding: 0 10px">                $gmt  = '2012-12-01 00:00:00';

</span><span class="cx" style="display: block; padding: 0 10px">                $date = '2012-12-01';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $gmt, get_gmt_from_date( $date ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $gmt, get_gmt_from_date( $date ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'timezone_string', 'Europe/London' );

</span><span class="cx" style="display: block; padding: 0 10px">                $local = '2012-12-01';

</span><span class="cx" style="display: block; padding: 0 10px">                $gmt   = '2012-12-01 00:00:00';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $gmt, get_gmt_from_date( $local ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $gmt, get_gmt_from_date( $local ) );

</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">@@ -110,7 +110,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $utc         = $local->setTimezone( new DateTimeZone( 'UTC' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $mysql_local = $local->format( 'Y-m-d H:i:s' );

</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->assertEquals( $utc->format( DATE_RFC3339 ), get_gmt_from_date( $mysql_local, DATE_RFC3339 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $utc->format( DATE_RFC3339 ), get_gmt_from_date( $mysql_local, DATE_RFC3339 ) );

</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">@@ -126,7 +126,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $utc       = $local->setTimezone( new DateTimeZone( 'UTC' ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $mysql_utc = $utc->format( 'Y-m-d H:i:s' );

</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->assertEquals( $local->format( DATE_RFC3339 ), get_date_from_gmt( $mysql_utc, DATE_RFC3339 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $local->format( DATE_RFC3339 ), get_date_from_gmt( $mysql_utc, DATE_RFC3339 ) );

</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">@@ -144,45 +144,45 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $local = new DateTimeImmutable( 'now', wp_timezone() );

</span><span class="cx" style="display: block; padding: 0 10px">                $utc   = $local->setTimezone( new DateTimeZone( 'UTC' ) );

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $local->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        iso8601_to_datetime( $local->format( $format ) ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'Local time from local time.'

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $utc->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        iso8601_to_datetime( $local->format( $format ), 'gmt' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'UTC time from local time.'

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $local->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        iso8601_to_datetime( $local->format( $format_no_tz ) ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'Local time from local time w/o timezone.'

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $utc->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        iso8601_to_datetime( $local->format( $format_no_tz ), 'gmt' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'UTC time from local time w/o timezone.'

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $local->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        iso8601_to_datetime( $utc->format( $format ) ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'Local time from UTC time.'

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $utc->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        iso8601_to_datetime( $utc->format( $format ), 'gmt' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'UTC time from UTC time.'

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $local->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        iso8601_to_datetime( $utc->format( $format_no_tz ) . 'Z' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'Local time from UTC w/ Z timezone.'

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $utc->format( 'Y-m-d H:i:s' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        iso8601_to_datetime( $utc->format( $format_no_tz ) . 'Z', 'gmt' ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'UTC time from UTC w/ Z timezone.'

</span></span></pre></div>

<a id="trunktestsphpunittestsformattingent2ncrphp"></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/ent2ncr.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/ent2ncr.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/ent2ncr.php    2020-09-02 00:35:36 UTC (rev 48937)

</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">        function test_converts_named_entities_to_numeric_character_references( $entity, $ncr ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $entity = '&' . $entity . ';';

</span><span class="cx" style="display: block; padding: 0 10px">                $ncr    = '&#' . $ncr . ';';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $ncr, ent2ncr( $entity ), $entity );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $ncr, ent2ncr( $entity ), $entity );

</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="trunktestsphpunittestsformattingisoDescramblerphp"></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/isoDescrambler.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/isoDescrambler.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/isoDescrambler.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,6 +9,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * =?iso-8859-1?q?this=20is=20some=20text?=

</span><span class="cx" style="display: block; padding: 0 10px">        */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_decodes_iso_8859_1_rfc2047_q_encoding() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'this is some text', wp_iso_descrambler( '=?iso-8859-1?q?this=20is=20some=20text?=' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'this is some text', wp_iso_descrambler( '=?iso-8859-1?q?this=20is=20some=20text?=' ) );

</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="trunktestsphpunittestsformattingredirectphp"></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/redirect.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/redirect.php 2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/formatting/redirect.php   2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,19 +46,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_sanitize_redirect() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com/watchthelinefeedgo', wp_sanitize_redirect( 'http://example.com/watchthelinefeed%0Ago' ) );

-               $this->assertEquals( 'http://example.com/watchthelinefeedgo', wp_sanitize_redirect( 'http://example.com/watchthelinefeed%0ago' ) );

-               $this->assertEquals( 'http://example.com/watchthecarriagereturngo', wp_sanitize_redirect( 'http://example.com/watchthecarriagereturn%0Dgo' ) );

-               $this->assertEquals( 'http://example.com/watchthecarriagereturngo', wp_sanitize_redirect( 'http://example.com/watchthecarriagereturn%0dgo' ) );

-               $this->assertEquals( 'http://example.com/watchtheallowedcharacters-~+_.?#=&;,/:%!*stay', wp_sanitize_redirect( 'http://example.com/watchtheallowedcharacters-~+_.?#=&;,/:%!*stay' ) );

-               $this->assertEquals( 'http://example.com/watchtheutf8convert%F0%9D%8C%86', wp_sanitize_redirect( "http://example.com/watchtheutf8convert\xf0\x9d\x8c\x86" ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com/watchthelinefeedgo', wp_sanitize_redirect( 'http://example.com/watchthelinefeed%0Ago' ) );

+               $this->assertSame( 'http://example.com/watchthelinefeedgo', wp_sanitize_redirect( 'http://example.com/watchthelinefeed%0ago' ) );

+               $this->assertSame( 'http://example.com/watchthecarriagereturngo', wp_sanitize_redirect( 'http://example.com/watchthecarriagereturn%0Dgo' ) );

+               $this->assertSame( 'http://example.com/watchthecarriagereturngo', wp_sanitize_redirect( 'http://example.com/watchthecarriagereturn%0dgo' ) );

+               $this->assertSame( 'http://example.com/watchtheallowedcharacters-~+_.?#=&;,/:%!*stay', wp_sanitize_redirect( 'http://example.com/watchtheallowedcharacters-~+_.?#=&;,/:%!*stay' ) );

+               $this->assertSame( 'http://example.com/watchtheutf8convert%F0%9D%8C%86', wp_sanitize_redirect( "http://example.com/watchtheutf8convert\xf0\x9d\x8c\x86" ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Nesting checks.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com/watchthecarriagereturngo', wp_sanitize_redirect( 'http://example.com/watchthecarriagereturn%0%0ddgo' ) );

-               $this->assertEquals( 'http://example.com/watchthecarriagereturngo', wp_sanitize_redirect( 'http://example.com/watchthecarriagereturn%0%0DDgo' ) );

-               $this->assertEquals( 'http://example.com/whyisthisintheurl/?param[1]=foo', wp_sanitize_redirect( 'http://example.com/whyisthisintheurl/?param[1]=foo' ) );

-               $this->assertEquals( 'http://[2606:2800:220:6d:26bf:1447:aa7]/', wp_sanitize_redirect( 'http://[2606:2800:220:6d:26bf:1447:aa7]/' ) );

-               $this->assertEquals( 'http://example.com/search.php?search=(amistillhere)', wp_sanitize_redirect( 'http://example.com/search.php?search=(amistillhere)' ) );

-               $this->assertEquals( 'http://example.com/@username', wp_sanitize_redirect( 'http://example.com/@username' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com/watchthecarriagereturngo', wp_sanitize_redirect( 'http://example.com/watchthecarriagereturn%0%0ddgo' ) );

+               $this->assertSame( 'http://example.com/watchthecarriagereturngo', wp_sanitize_redirect( 'http://example.com/watchthecarriagereturn%0%0DDgo' ) );

+               $this->assertSame( 'http://example.com/whyisthisintheurl/?param[1]=foo', wp_sanitize_redirect( 'http://example.com/whyisthisintheurl/?param[1]=foo' ) );

+               $this->assertSame( 'http://[2606:2800:220:6d:26bf:1447:aa7]/', wp_sanitize_redirect( 'http://[2606:2800:220:6d:26bf:1447:aa7]/' ) );

+               $this->assertSame( 'http://example.com/search.php?search=(amistillhere)', wp_sanitize_redirect( 'http://example.com/search.php?search=(amistillhere)' ) );

+               $this->assertSame( 'http://example.com/@username', wp_sanitize_redirect( 'http://example.com/@username' ) );

</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">@@ -65,8 +65,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @group 36998

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_sanitize_redirect_should_encode_spaces() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'http://example.com/test%20spaces', wp_sanitize_redirect( 'http://example.com/test%20spaces' ) );

-               $this->assertEquals( 'http://example.com/test%20spaces%20in%20url', wp_sanitize_redirect( 'http://example.com/test spaces in url' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'http://example.com/test%20spaces', wp_sanitize_redirect( 'http://example.com/test%20spaces' ) );

+               $this->assertSame( 'http://example.com/test%20spaces%20in%20url', wp_sanitize_redirect( 'http://example.com/test spaces in url' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider valid_url_provider

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_validate_redirect_valid_url( $url, $expected ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_validate_redirect( $url ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_validate_redirect( $url ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@

<span class="cx" style="display: block; padding: 0 10px">                // Set the global to current URI.

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['REQUEST_URI'] = $current_uri;

</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->assertEquals( $expected, wp_validate_redirect( $url, false ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_validate_redirect( $url, false ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Delete or reset the global as required.

</span><span class="cx" style="display: block; padding: 0 10px">                if ( $unset ) {

</span></span></pre></div>

<a id="trunktestsphpunittestsfunctionsallowedProtocolsphp"></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/allowedProtocols.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/allowedProtocols.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/functions/allowedProtocols.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,8 +29,8 @@

<span class="cx" style="display: block; padding: 0 10px">         * @param string Example URL.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_allowed_protocols( $protocol, $url ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $url, esc_url( $url, $protocol ) );

-               $this->assertEquals( $url, esc_url( $url, wp_allowed_protocols() ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $url, esc_url( $url, $protocol ) );

+               $this->assertSame( $url, esc_url( $url, wp_allowed_protocols() ) );

</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="trunktestsphpunittestsfunctionsanonymizationphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/functions/anonymization.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/anonymization.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/functions/anonymization.php       2020-09-02 00:35:36 UTC (rev 48937)

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                /* Todo test ipv6_fallback mode if keeping it.*/

</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->assertEquals( $expected_result, $actual_result );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_result, $actual_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">@@ -226,7 +226,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * Test date anonymization of `wp_privacy_anonymize_data()`.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_anonymize_date() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '0000-00-00 00:00:00', wp_privacy_anonymize_data( 'date', '2003-12-25 12:34:56' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '0000-00-00 00:00:00', wp_privacy_anonymize_data( 'date', '2003-12-25 12:34:56' ) );

</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">@@ -234,7 +234,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_anonymize_text() {

</span><span class="cx" style="display: block; padding: 0 10px">                $text = __( 'Four score and seven years ago' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '[deleted]', wp_privacy_anonymize_data( 'text', $text ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '[deleted]', wp_privacy_anonymize_data( 'text', $text ) );

</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">@@ -242,7 +242,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_anonymize_long_text() {

</span><span class="cx" style="display: block; padding: 0 10px">                $text = __( 'Four score and seven years ago' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'This content was deleted by the author.', wp_privacy_anonymize_data( 'longtext', $text ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'This content was deleted by the author.', wp_privacy_anonymize_data( 'longtext', $text ) );

</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="trunktestsphpunittestsfunctionscanonicalCharsetphp"></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/canonicalCharset.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/canonicalCharset.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/functions/canonicalCharset.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,43 +9,43 @@

</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Functions_CanonicalCharset extends WP_UnitTestCase {

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_utf_8_lower() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'UTF-8', _canonical_charset( 'utf-8' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'UTF-8', _canonical_charset( 'utf-8' ) );

</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_utf_8_upper() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'UTF-8', _canonical_charset( 'UTF-8' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'UTF-8', _canonical_charset( 'UTF-8' ) );

</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_utf_8_mixxed() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'UTF-8', _canonical_charset( 'Utf-8' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'UTF-8', _canonical_charset( 'Utf-8' ) );

</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_utf_8() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'UTF-8', _canonical_charset( 'UTF8' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'UTF-8', _canonical_charset( 'UTF8' ) );

</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_iso_lower() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'ISO-8859-1', _canonical_charset( 'iso-8859-1' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'ISO-8859-1', _canonical_charset( 'iso-8859-1' ) );

</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_iso_upper() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'ISO-8859-1', _canonical_charset( 'ISO-8859-1' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'ISO-8859-1', _canonical_charset( 'ISO-8859-1' ) );

</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_iso_mixxed() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'ISO-8859-1', _canonical_charset( 'Iso8859-1' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'ISO-8859-1', _canonical_charset( 'Iso8859-1' ) );

</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_iso() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'ISO-8859-1', _canonical_charset( 'ISO8859-1' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'ISO-8859-1', _canonical_charset( 'ISO8859-1' ) );

</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_random() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'random', _canonical_charset( 'random' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'random', _canonical_charset( 'random' ) );

</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_empty() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', _canonical_charset( '' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', _canonical_charset( '' ) );

</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">@@ -55,32 +55,32 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $orig_blog_charset = get_option( 'blog_charset' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'utf8' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'UTF-8', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'UTF-8', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'utf-8' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'UTF-8', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'UTF-8', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'UTF8' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'UTF-8', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'UTF-8', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'UTF-8' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'UTF-8', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'UTF-8', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'ISO-8859-1' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'ISO-8859-1', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'ISO-8859-1', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'ISO8859-1' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'ISO-8859-1', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'ISO-8859-1', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'iso8859-1' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'ISO-8859-1', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'ISO-8859-1', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'iso-8859-1' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'ISO-8859-1', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'ISO-8859-1', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Arbitrary strings are passed through.

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'foobarbaz' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foobarbaz', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foobarbaz', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', $orig_blog_charset );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span></span></pre></div>

<a id="trunktestsphpunittestsfunctionscleanupHeaderCommentphp"></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/cleanupHeaderComment.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/cleanupHeaderComment.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/functions/cleanupHeaderComment.php        2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @param string $expected

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_cleanup_header_comment( $test_string, $expected ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEqualsIgnoreEOL( $expected, _cleanup_header_comment( $test_string ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, _cleanup_header_comment( $test_string ) );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span></span></pre></div>

<a id="trunktestsphpunittestsfunctionsgetWeekstartendphp"></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/getWeekstartend.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/getWeekstartend.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/functions/getWeekstartend.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'end'   => 1455494399,

</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->assertEquals( $expected, get_weekstartend( '2016-02-12' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_weekstartend( '2016-02-12' ) );

</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_start_of_week_sunday() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'end'   => 1455407999,

</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->assertEquals( $expected, get_weekstartend( '2016-02-12', 0 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_weekstartend( '2016-02-12', 0 ) );

</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_start_of_week_should_fall_back_on_start_of_week_option() {

</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">                        'end'   => 1455580799,

</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->assertEquals( $expected, get_weekstartend( '2016-02-12' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_weekstartend( '2016-02-12' ) );

</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_start_of_week_should_fall_back_on_sunday_when_option_is_missing() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,6 +42,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'end'   => 1455407999,

</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->assertEquals( $expected, get_weekstartend( '2016-02-12' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, get_weekstartend( '2016-02-12' ) );

</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="trunktestsphpunittestsfunctionsnumberFormatI18nphp"></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/numberFormatI18n.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/numberFormatI18n.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/functions/numberFormatI18n.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,8 +16,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['wp_locale'] = $locale;

</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->assertEquals( '123,457', $actual_1 );

-               $this->assertEquals( '123,456.7890', $actual_2 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '123,457', $actual_1 );

+               $this->assertSame( '123,456.7890', $actual_2 );

</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_should_respect_number_format_of_locale() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,17 +33,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['wp_locale']->number_format['decimal_point'] = $decimal_point;

</span><span class="cx" style="display: block; padding: 0 10px">                $GLOBALS['wp_locale']->number_format['thousands_sep'] = $thousands_sep;

</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->assertEquals( '123^457', $actual_1 );

-               $this->assertEquals( '123^456@7890', $actual_2 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '123^457', $actual_1 );

+               $this->assertSame( '123^456@7890', $actual_2 );

</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_should_default_to_en_us_format() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '123,457', number_format_i18n( 123456.789, 0 ) );

-               $this->assertEquals( '123,456.7890', number_format_i18n( 123456.789, 4 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '123,457', number_format_i18n( 123456.789, 0 ) );

+               $this->assertSame( '123,456.7890', number_format_i18n( 123456.789, 4 ) );

</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_should_handle_negative_precision() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '123,457', number_format_i18n( 123456.789, 0 ) );

-               $this->assertEquals( '123,456.7890', number_format_i18n( 123456.789, -4 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '123,457', number_format_i18n( 123456.789, 0 ) );

+               $this->assertSame( '123,456.7890', number_format_i18n( 123456.789, -4 ) );

</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="trunktestsphpunittestsfunctionsremoveQueryArgphp"></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/removeQueryArg.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/removeQueryArg.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/functions/removeQueryArg.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = remove_query_arg( $keys_to_remove, $url );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $actual );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        public function remove_query_arg_provider() {

</span></span></pre></div>

<a id="trunktestsphpunittestsfunctionswpGetArchivesphp"></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/wpGetArchives.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpGetArchives.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/functions/wpGetArchives.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,12 +31,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_get_archives_default() {

</span><span class="cx" style="display: block; padding: 0 10px">                $expected['default'] = "<li><a href='" . $this->month_url . "'>" . gmdate( 'F Y' ) . '</a></li>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected['default'], trim( wp_get_archives( array( 'echo' => false ) ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected['default'], trim( wp_get_archives( array( 'echo' => false ) ) ) );

</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_wp_get_archives_type() {

</span><span class="cx" style="display: block; padding: 0 10px">                $expected['type'] = "<li><a href='" . $this->year_url . "'>" . gmdate( 'Y' ) . '</a></li>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $expected['type'],

</span><span class="cx" style="display: block; padding: 0 10px">                        trim(

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_get_archives(

</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">        <li><a href='$link4'>$title4</a></li>

</span><span class="cx" style="display: block; padding: 0 10px">        <li><a href='$link5'>$title5</a></li>

</span><span class="cx" style="display: block; padding: 0 10px"> EOF;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEqualsIgnoreEOL(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $expected['limit'],

</span><span class="cx" style="display: block; padding: 0 10px">                        trim(

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_get_archives(

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_get_archives_format() {

</span><span class="cx" style="display: block; padding: 0 10px">                $expected['format'] = "<option value='" . $this->month_url . "'> " . gmdate( 'F Y' ) . ' </option>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $expected['format'],

</span><span class="cx" style="display: block; padding: 0 10px">                        trim(

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_get_archives(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_get_archives_before_and_after() {

</span><span class="cx" style="display: block; padding: 0 10px">                $expected['before_and_after'] = "<div><a href='" . $this->month_url . "'>" . gmdate( 'F Y' ) . '</a></div>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $expected['before_and_after'],

</span><span class="cx" style="display: block; padding: 0 10px">                        trim(

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_get_archives(

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_get_archives_show_post_count() {

</span><span class="cx" style="display: block; padding: 0 10px">                $expected['show_post_count'] = "<li><a href='" . $this->month_url . "'>" . gmdate( 'F Y' ) . '</a>&nbsp;(8)</li>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $expected['show_post_count'],

</span><span class="cx" style="display: block; padding: 0 10px">                        trim(

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_get_archives(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> <li><a href='{$oct_url}'>October 2012</a></li>

</span><span class="cx" style="display: block; padding: 0 10px">        <li><a href='{$this->month_url}'>$date_full</a></li>

</span><span class="cx" style="display: block; padding: 0 10px"> EOF;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEqualsIgnoreEOL(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $expected['order_asc'],

</span><span class="cx" style="display: block; padding: 0 10px">                        trim(

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_get_archives(

</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"> <li><a href='{$this->month_url}'>$date_full</a></li>

</span><span class="cx" style="display: block; padding: 0 10px">        <li><a href='{$oct_url}'>October 2012</a></li>

</span><span class="cx" style="display: block; padding: 0 10px"> EOF;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEqualsIgnoreEOL(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL(

</ins><span class="cx" style="display: block; padding: 0 10px">                         $expected['order_desc'],

</span><span class="cx" style="display: block; padding: 0 10px">                        trim(

</span><span class="cx" style="display: block; padding: 0 10px">                                wp_get_archives(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,6 +204,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'post_type' => 'taco',

</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->assertEquals( $expected, trim( $archives ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, trim( $archives ) );

</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="trunktestsphpunittestsfunctionswpListFilterphp"></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/wpListFilter.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpListFilter.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/functions/wpListFilter.php        2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'AND'

</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->assertEquals( 2, count( $list ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, count( $list ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'foo', $list );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'bar', $list );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</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">                        'OR'

</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->assertEquals( 3, count( $list ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 3, count( $list ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'foo', $list );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'bar', $list );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'baz', $list );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'NOT'

</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->assertEquals( 1, count( $list ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $list ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'baz', $list );

</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">@@ -92,7 +92,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'AND',

</span><span class="cx" style="display: block; padding: 0 10px">                        'name'

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'foo' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                'bar' => 'bar',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'OR',

</span><span class="cx" style="display: block; padding: 0 10px">                        'name'

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'foo' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                'bar' => 'bar',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,12 +130,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'NOT',

</span><span class="cx" style="display: block; padding: 0 10px">                        'name'

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( 'baz' => 'baz' ), $list );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'baz' => 'baz' ), $list );

</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_wp_list_pluck() {

</span><span class="cx" style="display: block; padding: 0 10px">                $list = wp_list_pluck( $this->object_list, 'name' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'foo' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                'bar' => 'bar',

</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">                );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $list = wp_list_pluck( $this->array_list, 'name' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'foo' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                'bar' => 'bar',

</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">        function test_wp_list_pluck_index_key() {

</span><span class="cx" style="display: block; padding: 0 10px">                $list = wp_list_pluck( $this->array_list, 'name', 'id' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'f' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                'b' => 'bar',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +175,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_list_pluck_object_index_key() {

</span><span class="cx" style="display: block; padding: 0 10px">                $list = wp_list_pluck( $this->object_list, 'name', 'id' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'f' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                'b' => 'bar',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +190,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_list_pluck_missing_index_key() {

</span><span class="cx" style="display: block; padding: 0 10px">                $list = wp_list_pluck( $this->array_list, 'name', 'nonexistent' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                0 => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                1 => 'bar',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +207,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $array_list = $this->array_list;

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $array_list['bar']['id'] );

</span><span class="cx" style="display: block; padding: 0 10px">                $list = wp_list_pluck( $array_list, 'name', 'id' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'f' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                0   => 'bar',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +224,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $mixed_list        = $this->array_list;

</span><span class="cx" style="display: block; padding: 0 10px">                $mixed_list['bar'] = (object) $mixed_list['bar'];

</span><span class="cx" style="display: block; padding: 0 10px">                $list              = wp_list_pluck( $mixed_list, 'name', 'id' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'f' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                'b' => 'bar',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,7 +247,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'stdClass', $ref_list[1] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $list = wp_list_pluck( $ref_list, 'name' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                'bar',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInstanceOf( 'stdClass', $ref_list[1] );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $list = wp_list_pluck( $ref_list, 'name', 'id' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'f' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                'b' => 'bar',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,13 +286,13 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_filter_object_list_nested_array_and() {

</span><span class="cx" style="display: block; padding: 0 10px">                $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'AND' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, count( $list ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $list ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'baz', $list );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_filter_object_list_nested_array_not() {

</span><span class="cx" style="display: block; padding: 0 10px">                $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'red' ) ), 'NOT' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 2, count( $list ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, count( $list ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'bar', $list );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'baz', $list );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +306,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        'OR'

</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->assertEquals( 2, count( $list ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, count( $list ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'foo', $list );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'baz', $list );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,7 +313,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_filter_object_list_nested_array_or_singular() {

</span><span class="cx" style="display: block; padding: 0 10px">                $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'OR' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 1, count( $list ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, count( $list ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertArrayHasKey( 'baz', $list );

</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">@@ -320,12 +320,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_filter_object_list_nested_array_and_field() {

</span><span class="cx" style="display: block; padding: 0 10px">                $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'AND', 'name' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array( 'baz' => 'baz' ), $list );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 'baz' => 'baz' ), $list );

</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_filter_object_list_nested_array_not_field() {

</span><span class="cx" style="display: block; padding: 0 10px">                $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'green' ) ), 'NOT', 'name' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'foo' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                'baz' => 'baz',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,7 +344,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        'OR',

</span><span class="cx" style="display: block; padding: 0 10px">                        'name'

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'foo' => 'foo',

</span><span class="cx" style="display: block; padding: 0 10px">                                'baz' => 'baz',

</span></span></pre></div>

<a id="trunktestsphpunittestsfunctionswpListUtilphp"></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/wpListUtil.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpListUtil.php        2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/functions/wpListUtil.php  2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -691,7 +691,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * @param string       $order   Either 'ASC' or 'DESC'.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_list_sort( $list, $orderby, $order, $expected ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_list_sort( $list, $orderby, $order ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_list_sort( $list, $orderby, $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">        public function data_test_wp_list_sort_preserve_keys() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1016,7 +1016,7 @@

<span class="cx" style="display: block; padding: 0 10px">         * @param string       $order   Either 'ASC' or 'DESC'.

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_wp_list_sort_preserve_keys( $list, $orderby, $order, $expected ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_list_sort( $list, $orderby, $order, true ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_list_sort( $list, $orderby, $order, true ) );

</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_list_util_get_input() {

</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     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/functions/wpRemoteFopen.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,6 +29,6 @@

</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><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $response );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 40148, strlen( $response ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 40148, strlen( $response ) );

</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="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   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/functions.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $x->_baba = 5;

</span><span class="cx" style="display: block; padding: 0 10px">                $x->yZ    = 'baba'; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase

</span><span class="cx" style="display: block; padding: 0 10px">                $x->a     = array( 5, 111, 'x' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                '_baba' => 5,

</span><span class="cx" style="display: block; padding: 0 10px">                                'yZ'    => 'baba',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,19 +18,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        wp_parse_args( $x )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $y = new MockClass;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array(), wp_parse_args( $y ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), wp_parse_args( $y ) );

</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_wp_parse_args_array() {

</span><span class="cx" style="display: block; padding: 0 10px">                // Arrays.

</span><span class="cx" style="display: block; padding: 0 10px">                $a = array();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array(), wp_parse_args( $a ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), wp_parse_args( $a ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $b = array(

</span><span class="cx" style="display: block; padding: 0 10px">                        '_baba' => 5,

</span><span class="cx" style="display: block; padding: 0 10px">                        'yZ'    => 'baba',

</span><span class="cx" style="display: block; padding: 0 10px">                        'a'     => array( 5, 111, 'x' ),

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                '_baba' => 5,

</span><span class="cx" style="display: block; padding: 0 10px">                                'yZ'    => 'baba',

</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">                $x->yZ    = 'baba'; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase

</span><span class="cx" style="display: block; padding: 0 10px">                $x->a     = array( 5, 111, 'x' );

</span><span class="cx" style="display: block; padding: 0 10px">                $d        = array( 'pu' => 'bu' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'pu'    => 'bu',

</span><span class="cx" style="display: block; padding: 0 10px">                                '_baba' => 5,

</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">                        wp_parse_args( $x, $d )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $e = array( '_baba' => 6 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                '_baba' => 5,

</span><span class="cx" style="display: block; padding: 0 10px">                                'yZ'    => 'baba',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,10 +69,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_parse_args_other() {

</span><span class="cx" style="display: block; padding: 0 10px">                $b = true;

</span><span class="cx" style="display: block; padding: 0 10px">                wp_parse_str( $b, $s );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $s, wp_parse_args( $b ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $s, wp_parse_args( $b ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $q = 'x=5&_baba=dudu&';

</span><span class="cx" style="display: block; padding: 0 10px">                wp_parse_str( $q, $ss );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $ss, wp_parse_args( $q ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $ss, wp_parse_args( $q ) );

</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">@@ -136,7 +136,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_wp_normalize_path

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_normalize_path( $path, $expected ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_normalize_path( $path ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_normalize_path( $path ) );

</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 data_wp_normalize_path() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,32 +168,32 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $testdir = DIR_TESTDATA . '/images/';

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Sanity check.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcdefg.png' ), 'Sanitiy check failed' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'abcdefg.png', wp_unique_filename( $testdir, 'abcdefg.png' ), 'Sanitiy check failed' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check number is appended for file already exists.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFileExists( $testdir . 'test-image.png', 'Test image does not exist' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'test-image-1.png', wp_unique_filename( $testdir, 'test-image.png' ), 'Number not appended correctly' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'test-image-1.png', wp_unique_filename( $testdir, 'test-image.png' ), 'Number not appended correctly' );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFileNotExists( $testdir . 'test-image-1.png' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check special chars.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'testtest-image.png', wp_unique_filename( $testdir, 'testtést-imagé.png' ), 'Filename with special chars failed' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'testtest-image.png', wp_unique_filename( $testdir, 'testtést-imagé.png' ), 'Filename with special chars failed' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check special chars with potential conflicting name.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'test-image-1.png', wp_unique_filename( $testdir, 'tést-imagé.png' ), 'Filename with special chars failed' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'test-image-1.png', wp_unique_filename( $testdir, 'tést-imagé.png' ), 'Filename with special chars failed' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check with single quotes in name (somehow).

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'abcdefgh.png', wp_unique_filename( $testdir, "abcdefg'h.png" ), 'File with quote failed' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'abcdefgh.png', wp_unique_filename( $testdir, "abcdefg'h.png" ), 'File with quote failed' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check with double quotes in name (somehow).

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'abcdefgh.png', wp_unique_filename( $testdir, 'abcdefg"h.png' ), 'File with quote failed' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'abcdefgh.png', wp_unique_filename( $testdir, 'abcdefg"h.png' ), 'File with quote failed' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test crazy name (useful for regression tests).

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '12af34567890@..^_qwerty-fghjkl-zx.png', wp_unique_filename( $testdir, '12%af34567890#~!@#$..%^&*()|_+qwerty  fgh`jkl zx<>?:"{}[]="\'/?.png' ), 'Failed crazy file name' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '12af34567890@..^_qwerty-fghjkl-zx.png', wp_unique_filename( $testdir, '12%af34567890#~!@#$..%^&*()|_+qwerty  fgh`jkl zx<>?:"{}[]="\'/?.png' ), 'Failed crazy file name' );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test slashes in names.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\fg.png' ), 'Slash not removed' );

-               $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\\fg.png' ), 'Double slashed not removed' );

-               $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\\\fg.png' ), 'Tripple slashed not removed' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\fg.png' ), 'Slash not removed' );

+               $this->assertSame( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\\fg.png' ), 'Double slashed not removed' );

+               $this->assertSame( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\\\fg.png' ), 'Tripple slashed not removed' );

</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">@@ -205,12 +205,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'upload_dir', array( $this, 'upload_dir_patch_basedir' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test collision with "dimension-like" original filename.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'one-blue-pixel-100x100-1.png', wp_unique_filename( $testdir, 'one-blue-pixel-100x100.png' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'one-blue-pixel-100x100-1.png', wp_unique_filename( $testdir, 'one-blue-pixel-100x100.png' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Test collision with existing sub-size filename.

<span class="cx" style="display: block; padding: 0 10px">                // Existing files: one-blue-pixel-100x100.png, one-blue-pixel-1-100x100.png.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'one-blue-pixel-2.png', wp_unique_filename( $testdir, 'one-blue-pixel.png' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'one-blue-pixel-2.png', wp_unique_filename( $testdir, 'one-blue-pixel.png' ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 // Same as above with upper case extension.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'one-blue-pixel-2.png', wp_unique_filename( $testdir, 'one-blue-pixel.PNG' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'one-blue-pixel-2.png', wp_unique_filename( $testdir, 'one-blue-pixel.PNG' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'upload_dir', array( $this, 'upload_dir_patch_basedir' ) );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,9 +368,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $urls as $url ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $_SERVER['REQUEST_URI'] = 'nothing';

</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->assertEquals( "$url?foo=1", add_query_arg( 'foo', '1', $url ) );

-                       $this->assertEquals( "$url?foo=1", add_query_arg( array( 'foo' => '1' ), $url ) );

-                       $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( "$url?foo=1", add_query_arg( 'foo', '1', $url ) );

+                       $this->assertSame( "$url?foo=1", add_query_arg( array( 'foo' => '1' ), $url ) );

+                       $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "$url?foo=2",

</span><span class="cx" style="display: block; padding: 0 10px">                                add_query_arg(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,7 +380,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $url

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "$url?foo=1&bar=2",

</span><span class="cx" style="display: block; padding: 0 10px">                                add_query_arg(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,9 +393,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $_SERVER['REQUEST_URI'] = $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->assertEquals( "$url?foo=1", add_query_arg( 'foo', '1' ) );

-                       $this->assertEquals( "$url?foo=1", add_query_arg( array( 'foo' => '1' ) ) );

-                       $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( "$url?foo=1", add_query_arg( 'foo', '1' ) );

+                       $this->assertSame( "$url?foo=1", add_query_arg( array( 'foo' => '1' ) ) );

+                       $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "$url?foo=2",

</span><span class="cx" style="display: block; padding: 0 10px">                                add_query_arg(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,7 +404,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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "$url?foo=1&bar=2",

</span><span class="cx" style="display: block; padding: 0 10px">                                add_query_arg(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,9 +419,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $_SERVER['REQUEST_URI'] = 'nothing';

</span><span class="cx" style="display: block; padding: 0 10px">                        $url                    = str_replace( '#frag', '', $frag_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->assertEquals( "$url?foo=1#frag", add_query_arg( 'foo', '1', $frag_url ) );

-                       $this->assertEquals( "$url?foo=1#frag", add_query_arg( array( 'foo' => '1' ), $frag_url ) );

-                       $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( "$url?foo=1#frag", add_query_arg( 'foo', '1', $frag_url ) );

+                       $this->assertSame( "$url?foo=1#frag", add_query_arg( array( 'foo' => '1' ), $frag_url ) );

+                       $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "$url?foo=2#frag",

</span><span class="cx" style="display: block; padding: 0 10px">                                add_query_arg(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,7 +431,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $frag_url

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "$url?foo=1&bar=2#frag",

</span><span class="cx" style="display: block; padding: 0 10px">                                add_query_arg(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,9 +444,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $_SERVER['REQUEST_URI'] = $frag_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->assertEquals( "$url?foo=1#frag", add_query_arg( 'foo', '1' ) );

-                       $this->assertEquals( "$url?foo=1#frag", add_query_arg( array( 'foo' => '1' ) ) );

-                       $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( "$url?foo=1#frag", add_query_arg( 'foo', '1' ) );

+                       $this->assertSame( "$url?foo=1#frag", add_query_arg( array( 'foo' => '1' ) ) );

+                       $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "$url?foo=2#frag",

</span><span class="cx" style="display: block; padding: 0 10px">                                add_query_arg(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,7 +455,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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "$url?foo=1&bar=2#frag",

</span><span class="cx" style="display: block; padding: 0 10px">                                add_query_arg(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -481,9 +481,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $qs_urls as $url ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        $_SERVER['REQUEST_URI'] = 'nothing';

</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->assertEquals( "$url&foo=1", add_query_arg( 'foo', '1', $url ) );

-                       $this->assertEquals( "$url&foo=1", add_query_arg( array( 'foo' => '1' ), $url ) );

-                       $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( "$url&foo=1", add_query_arg( 'foo', '1', $url ) );

+                       $this->assertSame( "$url&foo=1", add_query_arg( array( 'foo' => '1' ), $url ) );

+                       $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "$url&foo=2",

</span><span class="cx" style="display: block; padding: 0 10px">                                add_query_arg(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,7 +493,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $url

</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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "$url&foo=1&bar=2",

</span><span class="cx" style="display: block; padding: 0 10px">                                add_query_arg(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,9 +506,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $_SERVER['REQUEST_URI'] = $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->assertEquals( "$url&foo=1", add_query_arg( 'foo', '1' ) );

-                       $this->assertEquals( "$url&foo=1", add_query_arg( array( 'foo' => '1' ) ) );

-                       $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( "$url&foo=1", add_query_arg( 'foo', '1' ) );

+                       $this->assertSame( "$url&foo=1", add_query_arg( array( 'foo' => '1' ) ) );

+                       $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "$url&foo=2",

</span><span class="cx" style="display: block; padding: 0 10px">                                add_query_arg(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -517,7 +517,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->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                                 "$url&foo=1&bar=2",

</span><span class="cx" style="display: block; padding: 0 10px">                                add_query_arg(

</span><span class="cx" style="display: block; padding: 0 10px">                                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -536,7 +536,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_add_query_arg_numeric_keys() {

</span><span class="cx" style="display: block; padding: 0 10px">                $url = add_query_arg( array( 'foo' => 'bar' ), '1=1' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '1=1&foo=bar', $url );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '1=1&foo=bar', $url );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $url = add_query_arg(

</span><span class="cx" style="display: block; padding: 0 10px">                        array(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,10 +545,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        ),

</span><span class="cx" style="display: block; padding: 0 10px">                        '1=1'

</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->assertEquals( '1=2&foo=bar', $url );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '1=2&foo=bar', $url );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $url = add_query_arg( array( '1' => '2' ), 'foo=bar' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foo=bar&1=2', $url );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foo=bar&1=2', $url );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,7 +600,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $mimes2 = wp_get_mime_types();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $mimes2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $mimes2 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $mimes2, $mimes );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $mimes2, $mimes );

</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">@@ -610,32 +610,32 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $orig_blog_charset = get_option( 'blog_charset' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'utf8' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'UTF-8', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'UTF-8', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'utf-8' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'UTF-8', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'UTF-8', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'UTF8' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'UTF-8', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'UTF-8', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'UTF-8' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'UTF-8', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'UTF-8', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'ISO-8859-1' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'ISO-8859-1', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'ISO-8859-1', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'ISO8859-1' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'ISO-8859-1', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'ISO-8859-1', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'iso8859-1' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'ISO-8859-1', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'ISO-8859-1', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'iso-8859-1' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'ISO-8859-1', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'ISO-8859-1', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Arbitrary strings are passed through.

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', 'foobarbaz' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'foobarbaz', get_option( 'blog_charset' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'foobarbaz', get_option( 'blog_charset' ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'blog_charset', $orig_blog_charset );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -706,7 +706,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $_SERVER['HTTP_USER_AGENT'] = $user_agent;

</span><span class="cx" style="display: block; padding: 0 10px">                $actual                     = _device_can_upload();

</span><span class="cx" style="display: block; padding: 0 10px">                unset( $_SERVER['HTTP_USER_AGENT'] );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function data_device_can_upload() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -888,14 +888,14 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $urls );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $urls );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( count( $original_urls ), $urls );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $original_urls, $urls );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $original_urls, $urls );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $exploded = array_values( array_filter( array_map( 'trim', explode( "\n", $blob ) ) ) );

<span class="cx" style="display: block; padding: 0 10px">                // wp_extract_urls() calls html_entity_decode().

</span><span class="cx" style="display: block; padding: 0 10px">                $decoded = array_map( 'html_entity_decode', $exploded );

</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->assertEquals( $decoded, $urls );

-               $this->assertEquals( $original_urls, $decoded );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $decoded, $urls );

+               $this->assertSame( $original_urls, $decoded );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $blob = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor

<span class="cx" style="display: block; padding: 0 10px">                        incididunt ut labore http://woo.com/1,2,3,4,5,6/-1-2-3-4-/woo.html et dolore magna aliqua.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -909,7 +909,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $urls );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $urls );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 8, $urls );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array_slice( $original_urls, 0, 8 ), $urls );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array_slice( $original_urls, 0, 8 ), $urls );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $blob = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor

<span class="cx" style="display: block; padding: 0 10px">                        incididunt ut labore <a href="http://woo.com/1,2,3,4,5,6/-1-2-3-4-/woo.html">343462^</a> et dolore magna aliqua.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -923,7 +923,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $urls );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $urls );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertCount( 8, $urls );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array_slice( $original_urls, 0, 8 ), $urls );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array_slice( $original_urls, 0, 8 ), $urls );

</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">@@ -930,7 +930,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 28786

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_json_encode() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( wp_json_encode( 'a' ), '"a"' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( wp_json_encode( 'a' ), '"a"' );

</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">@@ -937,7 +937,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 28786

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_json_encode_utf8() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( wp_json_encode( '这' ), '"\u8fd9"' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( wp_json_encode( '这' ), '"\u8fd9"' );

</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">@@ -958,9 +958,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $eucjp = mb_convert_encoding( 'aあb', 'EUC-JP', 'UTF-8' );

</span><span class="cx" style="display: block; padding: 0 10px">                $utf8  = mb_convert_encoding( $eucjp, 'UTF-8', 'EUC-JP' );

</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->assertEquals( 'aあb', $utf8 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'aあb', $utf8 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '"a\u3042b"', wp_json_encode( $eucjp ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '"a\u3042b"', wp_json_encode( $eucjp ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                mb_detect_order( $old_charsets );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -983,9 +983,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $eucjp = mb_convert_encoding( 'aあb', 'EUC-JP', 'UTF-8' );

</span><span class="cx" style="display: block; padding: 0 10px">                $utf8  = mb_convert_encoding( $eucjp, 'UTF-8', 'EUC-JP' );

</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->assertEquals( 'aあb', $utf8 );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'aあb', $utf8 );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '["c","a\u3042b"]', wp_json_encode( array( 'c', $eucjp ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '["c","a\u3042b"]', wp_json_encode( array( 'c', $eucjp ) ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                mb_detect_order( $old_charsets );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -994,7 +994,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 28786

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_json_encode_array() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( wp_json_encode( array( 'a' ) ), '["a"]' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( wp_json_encode( array( 'a' ) ), '["a"]' );

</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">@@ -1003,7 +1003,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_json_encode_object() {

</span><span class="cx" style="display: block; padding: 0 10px">                $object    = new stdClass;

</span><span class="cx" style="display: block; padding: 0 10px">                $object->a = 'b';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( wp_json_encode( $object ), '{"a":"b"}' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( wp_json_encode( $object ), '{"a":"b"}' );

</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">@@ -1028,7 +1028,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( is_string( $date_return ), 'The date return must be a string' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $date_return, 'The date return could not be an empty string' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $date_return, 'The date does not match' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $date_return, 'The date does not match' );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( new DateTime( $expected ), new DateTime( $date_return ), 'The date is not the same after the call method' );

</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">@@ -1069,8 +1069,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $extensions as $type => $extension_list ) {

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $extension_list as $extension ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $this->assertEquals( $type, wp_ext2type( $extension ) );

-                               $this->assertEquals( $type, wp_ext2type( strtoupper( $extension ) ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $this->assertSame( $type, wp_ext2type( $extension ) );

+                               $this->assertSame( $type, wp_ext2type( strtoupper( $extension ) ) );

</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">@@ -1095,7 +1095,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $ini_limit_after  = ini_get( 'memory_limit' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $ini_limit_before, $ini_limit_after );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( false, $raised_limit );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertFalse( $raised_limit );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( WP_MAX_MEMORY_LIMIT, $ini_limit_after );

</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">@@ -1114,7 +1114,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">                $unique_uuids = array_unique( $uuids );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $uuids, $unique_uuids );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $uuids, $unique_uuids );

</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">@@ -1183,7 +1183,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertTrue( is_numeric( $id ) );

</span><span class="cx" style="display: block; padding: 0 10px">                        $ids[] = $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->assertEquals( $ids, array_unique( $ids ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $ids, array_unique( $ids ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Test with prefix.

</span><span class="cx" style="display: block; padding: 0 10px">                $ids = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1192,7 +1192,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertRegExp( '/^foo-\d+$/', $id );

</span><span class="cx" style="display: block; padding: 0 10px">                        $ids[] = $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->assertEquals( $ids, array_unique( $ids ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $ids, array_unique( $ids ) );

</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">@@ -1204,7 +1204,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->markTestSkipped( 'The exif PHP extension is not loaded.' );

</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->assertEquals( $expected, wp_get_image_mime( $file ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_get_image_mime( $file ) );

</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">@@ -1216,7 +1216,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );

</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->assertEquals( $expected, wp_check_filetype_and_ext( $file, $filename ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );

</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">@@ -1238,7 +1238,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">                add_filter( 'upload_mimes', array( $this, '_filter_mime_types_svg' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_check_filetype_and_ext( $file, $filename ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Cleanup.

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'upload_mimes', array( $this, '_test_add_mime_types_svg' ) );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1263,7 +1263,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">                add_filter( 'upload_mimes', array( $this, '_filter_mime_types_woff' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, wp_check_filetype_and_ext( $file, $filename ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Cleanup.

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'upload_mimes', array( $this, '_test_add_mime_types_woff' ) );

</span></span></pre></div>

<a id="trunktestsphpunittestsgeneralarchivesphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/general/archives.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/archives.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/general/archives.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result );

</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $num_queries + 1, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $num_queries + 1, $wpdb->num_queries );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $num_queries = $wpdb->num_queries;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,8 +44,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'posts' ) );

-               $this->assertEquals( $num_queries, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );

+               $this->assertSame( $num_queries, $wpdb->num_queries );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Change args, resulting in a different query string. Cache is not primed, expect 1 query.

</span><span class="cx" style="display: block; padding: 0 10px">                $result = wp_get_archives(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,8 +56,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'posts' ) );

-               $this->assertEquals( $num_queries + 1, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );

+               $this->assertSame( $num_queries + 1, $wpdb->num_queries );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $num_queries = $wpdb->num_queries;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,8 +70,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'posts' ) );

-               $this->assertEquals( $num_queries, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );

+               $this->assertSame( $num_queries, $wpdb->num_queries );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $num_queries = $wpdb->num_queries;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,8 +83,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'posts' ) );

-               $this->assertEquals( $num_queries + 1, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );

+               $this->assertSame( $num_queries + 1, $wpdb->num_queries );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $num_queries = $wpdb->num_queries;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,8 +96,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'posts' ) );

-               $this->assertEquals( $num_queries, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );

+               $this->assertSame( $num_queries, $wpdb->num_queries );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Change type. Cache is not primed, expect 1 query.

</span><span class="cx" style="display: block; padding: 0 10px">                $result = wp_get_archives(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,8 +107,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'posts' ) );

-               $this->assertEquals( $num_queries + 1, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );

+               $this->assertSame( $num_queries + 1, $wpdb->num_queries );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $num_queries = $wpdb->num_queries;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,8 +120,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'posts' ) );

-               $this->assertEquals( $num_queries, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );

+               $this->assertSame( $num_queries, $wpdb->num_queries );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Change type. Cache is not primed, expect 1 query.

</span><span class="cx" style="display: block; padding: 0 10px">                $result = wp_get_archives(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,8 +131,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'posts' ) );

-               $this->assertEquals( $num_queries + 1, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );

+               $this->assertSame( $num_queries + 1, $wpdb->num_queries );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $num_queries = $wpdb->num_queries;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,8 +144,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'posts' ) );

-               $this->assertEquals( $num_queries, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );

+               $this->assertSame( $num_queries, $wpdb->num_queries );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Change type. Cache is not primed, expect 1 query.

</span><span class="cx" style="display: block; padding: 0 10px">                $result = wp_get_archives(

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,8 +155,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'string', $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'posts' ) );

-               $this->assertEquals( $num_queries + 1, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );

+               $this->assertSame( $num_queries + 1, $wpdb->num_queries );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $num_queries = $wpdb->num_queries;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,7 +168,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->assertInternalType( 'string', $result );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'posts' ) );

-               $this->assertEquals( $num_queries, $wpdb->num_queries );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );

+               $this->assertSame( $num_queries, $wpdb->num_queries );

</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="trunktestsphpunittestsgeneraldocumenttitlephp"></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/document-title.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/document-title.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/general/document-title.php        2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'pre_get_document_title', array( $this, '_short_circuit_title' ) );

</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->assertEquals( 'A Wild Title', wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'A Wild Title', wp_get_document_title() );

</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 _short_circuit_title( $title ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,12 +101,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'document_title_parts', array( $this, '_front_page_title_parts' ) );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( '/' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( sprintf( '%s &#8211; Just another WordPress site', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( '%s &#8211; Just another WordPress site', $this->blog_name ), wp_get_document_title() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'show_on_front', 'posts' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( '/' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( sprintf( '%s &#8211; Just another WordPress site', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( '%s &#8211; Just another WordPress site', $this->blog_name ), wp_get_document_title() );

</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 _front_page_title_parts( $parts ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +129,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Show page name on home page if it's not the front page.

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( get_permalink( $blog_page_id ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( sprintf( 'blog-page &#8211; %s', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( 'blog-page &#8211; %s', $this->blog_name ), wp_get_document_title() );

</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_paged_title() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'document_title_parts', array( $this, '_paged_title_parts' ) );

</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->assertEquals( sprintf( '%s &#8211; Page 4 &#8211; Just another WordPress site', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( '%s &#8211; Page 4 &#8211; Just another WordPress site', $this->blog_name ), wp_get_document_title() );

</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 _paged_title_parts( $parts ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'document_title_parts', array( $this, '_singular_title_parts' ) );

</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->assertEquals( sprintf( 'test_title &#8211; %s', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( 'test_title &#8211; %s', $this->blog_name ), wp_get_document_title() );

</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 _singular_title_parts( $parts ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,19 +168,19 @@

</span><span class="cx" style="display: block; padding: 0 10px">        function test_category_title() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( '?cat=' . self::$category_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->assertEquals( sprintf( 'test_category &#8211; %s', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( 'test_category &#8211; %s', $this->blog_name ), wp_get_document_title() );

</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_search_title() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( '?s=test_title' );

</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->assertEquals( sprintf( 'Search Results for &#8220;test_title&#8221; &#8211; %s', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( 'Search Results for &#8220;test_title&#8221; &#8211; %s', $this->blog_name ), wp_get_document_title() );

</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_author_title() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( '?author=' . self::$author_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->assertEquals( sprintf( 'test_author &#8211; %s', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( 'test_author &#8211; %s', $this->blog_name ), wp_get_document_title() );

</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_post_type_archive_title() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,31 +203,31 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( '?post_type=cpt' );

</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->assertEquals( sprintf( 'test_cpt &#8211; %s', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( 'test_cpt &#8211; %s', $this->blog_name ), wp_get_document_title() );

</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_year_title() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( '?year=2015' );

</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->assertEquals( sprintf( '2015 &#8211; %s', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( '2015 &#8211; %s', $this->blog_name ), wp_get_document_title() );

</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_month_title() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( '?monthnum=09' );

</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->assertEquals( sprintf( 'September 2015 &#8211; %s', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( 'September 2015 &#8211; %s', $this->blog_name ), wp_get_document_title() );

</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_day_title() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( '?day=22' );

</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->assertEquals( sprintf( 'September 22, 2015 &#8211; %s', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( 'September 22, 2015 &#8211; %s', $this->blog_name ), wp_get_document_title() );

</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_404_title() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->go_to( '?m=404' );

</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->assertEquals( sprintf( 'Page not found &#8211; %s', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( 'Page not found &#8211; %s', $this->blog_name ), wp_get_document_title() );

</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_paged_post_title() {

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'title_tag_parts', array( $this, '_paged_post_title_parts' ) );

</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->assertEquals( sprintf( 'test_title &#8211; Page 4 &#8211; %s', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( 'test_title &#8211; Page 4 &#8211; %s', $this->blog_name ), wp_get_document_title() );

</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 _paged_post_title_parts( $parts ) {

</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">                add_filter( 'document_title_parts', array( $this, '_rearrange_title_parts' ) );

</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->assertEquals( sprintf( '%s &#8211; test_title', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( '%s &#8211; test_title', $this->blog_name ), wp_get_document_title() );

</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 _rearrange_title_parts( $parts ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,7 +269,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'document_title_separator', array( $this, '_change_title_separator' ) );

</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->assertEquals( sprintf( 'test_title %%%% %s', $this->blog_name ), wp_get_document_title() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( sprintf( 'test_title %%%% %s', $this->blog_name ), wp_get_document_title() );

</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 _change_title_separator( $sep ) {

</span></span></pre></div>

<a id="trunktestsphpunittestsgeneralpaginateLinksphp"></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/paginateLinks.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/paginateLinks.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/general/paginateLinks.php 2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> EXPECTED;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $links = paginate_links( array( 'total' => 50 ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEqualsIgnoreEOL( $expected, $links );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, $links );

</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_format() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'format' => 'page/%#%/',

</span><span class="cx" style="display: block; padding: 0 10px">                        )

</span><span class="cx" style="display: block; padding: 0 10px">                );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEqualsIgnoreEOL( $expected, $links );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, $links );

</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_prev_next_false() {

</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">                                'current'   => 2,

</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->assertEqualsIgnoreEOL( $expected, $links );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, $links );

</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_prev_next_true() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                'current'   => 2,

</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->assertEqualsIgnoreEOL( $expected, $links );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL( $expected, $links );

</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 increment_i18n_count() {

</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">                // The links should be:

</span><span class="cx" style="display: block; padding: 0 10px">                // < Previous 1 ... 49 50 51 ... 100 Next >

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 5, $this->i18n_count );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 5, $this->i18n_count );

</ins><span class="cx" style="display: block; padding: 0 10px">                 remove_filter( 'number_format_i18n', array( $this, 'increment_i18n_count' ) );

</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">@@ -170,8 +170,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $href  = $tag->attributes->getNamedItem( 'href' )->value;

</span><span class="cx" style="display: block; padding: 0 10px">                        $class = $tag->attributes->getNamedItem( 'class' )->value;

</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->assertEquals( $attributes['href'], $href );

-                       $this->assertEquals( $attributes['class'], $class );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $attributes['href'], $href );

+                       $this->assertSame( $attributes['class'], $class );

</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 page: 1.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +190,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotNull( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $class = $tag->attributes->getNamedItem( 'class' )->value;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'page-numbers current', $class );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'page-numbers current', $class );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $document->loadHTML( $links[1] );

</span><span class="cx" style="display: block; padding: 0 10px">                $tag = $document->getElementsByTagName( 'a' )->item( 0 );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +197,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotNull( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $href = $tag->attributes->getNamedItem( 'href' )->value;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( get_pagenum_link( 2 ), $href );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( get_pagenum_link( 2 ), $href );

</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 add_query_arg( $url ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +244,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertNotNull( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $href = $tag->attributes->getNamedItem( 'href' )->value;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected_href, $href );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected_href, $href );

</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">@@ -284,7 +284,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $this->assertNotNull( $tag );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        $href = $tag->attributes->getNamedItem( 'href' )->value;

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $expected_href, $href );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $expected_href, $href );

</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="trunktestsphpunittestsgeneralresourceHintsphp"></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/resourceHints.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/resourceHints.php       2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/general/resourceHints.php 2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_domains' ) );

</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->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function _add_dns_prefetch_domains( $hints, $method ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'wp_resource_hints', array( $this, '_add_preconnect_domains' ) );

</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->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function _add_preconnect_domains( $hints, $method ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +109,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'wp_resource_hints', array( $this, '_add_prerender_urls' ) );

</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->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function _add_prerender_urls( $hints, $method ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_long_urls' ) );

</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->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function _add_dns_prefetch_long_urls( $hints, $method ) {

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_dequeue_style( 'googlefonts' );

</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->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,7 +178,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_dequeue_style( 'googlefonts' );

</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->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function test_dns_prefetch_scripts_does_not_included_registered_only() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +191,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                wp_deregister_script( 'jquery-elsewhere' );

</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->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertNotContains( $unexpected, $actual );

</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">@@ -205,7 +205,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                wp_deregister_script( 'test-script' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = get_echo( 'wp_resource_hints' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,13 +218,13 @@

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'wp_resource_hints', array( $this, '_add_malformed_url_errant_colon' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = get_echo( 'wp_resource_hints' );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'wp_resource_hints', array( $this, '_add_malformed_url_errant_colon' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Unsupported Scheme.

</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'wp_resource_hints', array( $this, '_add_malformed_url_unsupported_scheme' ), 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = get_echo( 'wp_resource_hints' );

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'wp_resource_hints', array( $this, '_add_malformed_url_unsupported_scheme' ) );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function _add_malformed_url_errant_colon( $hints, $method ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,7 +259,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                remove_filter( 'wp_resource_hints', array( $this, '_add_url_with_attributes' ) );

</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->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function _add_url_with_attributes( $hints, $method ) {

</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    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/general/template.php      2020-09-02 00:35:36 UTC (rev 48937)

</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">                $this->assertEmpty( get_site_icon_url() );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_set_site_icon();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $this->site_icon_url, get_site_icon_url() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $this->site_icon_url, get_site_icon_url() );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->_remove_site_icon();

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEmpty( get_site_icon_url() );

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,7 +323,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                restore_current_blog();

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $expected_custom_logo = '<a href="' . $home_url . '" class="custom-logo-link" rel="home">' . $image . '</a>';

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected_custom_logo, get_custom_logo( $blog_id ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected_custom_logo, get_custom_logo( $blog_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">@@ -554,8 +554,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_selected_and_checked_with_equal_values

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_selected_and_checked_with_equal_values( $selected, $current ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( " selected='selected'", selected( $selected, $current, false ) );

-               $this->assertEquals( " checked='checked'", checked( $selected, $current, false ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( " selected='selected'", selected( $selected, $current, false ) );

+               $this->assertSame( " checked='checked'", checked( $selected, $current, false ) );

</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 data_selected_and_checked_with_equal_values() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -578,8 +578,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @dataProvider data_selected_and_checked_with_non_equal_values

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_selected_and_checked_with_non_equal_values( $selected, $current ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', selected( $selected, $current, false ) );

-               $this->assertEquals( '', checked( $selected, $current, false ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', selected( $selected, $current, false ) );

+               $this->assertSame( '', checked( $selected, $current, false ) );

</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 data_selected_and_checked_with_non_equal_values() {

</span></span></pre></div>

<a id="trunktestsphpunittestsgeneralwpErrorphp"></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/wpError.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/wpError.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/general/wpError.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_WP_Error_with_code_and_empty_message_and_empty_data_should_add_error_but_not_associated_data() {

</span><span class="cx" style="display: block; padding: 0 10px">                $wp_error = new WP_Error( 'code' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( null, $wp_error->get_error_data( 'code' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertNull( $wp_error->get_error_data( 'code' ) );

</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_Error_with_code_and_empty_message_and_non_empty_data_should_add_error_with_empty_message_and_that_stored_data() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @covers ::get_error_data

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_error_data_with_empty_code_and_no_errors_should_evaluate_as_null() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( null, $this->wp_error->get_error_data() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertNull( $this->wp_error->get_error_data() );

</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">@@ -281,7 +281,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_error_data_with_empty_code_one_error_no_data_should_evaluate_as_null() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->wp_error->add( 'code', 'message' );

</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->assertSame( null, $this->wp_error->get_error_data() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertNull( $this->wp_error->get_error_data() );

</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">@@ -291,7 +291,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->wp_error->add( 'code', 'message' );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->wp_error->add( 'code2', 'message2' );

</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->assertSame( null, $this->wp_error->get_error_data() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertNull( $this->wp_error->get_error_data() );

</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">@@ -330,7 +330,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         * @covers ::get_error_data

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_error_data_with_code_and_no_errors_should_evaluate_as_null() {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( null, $this->wp_error->get_error_data( 'code' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertNull( $this->wp_error->get_error_data( 'code' ) );

</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">@@ -339,7 +339,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_error_data_with_code_and_one_error_with_no_data_should_evaluate_as_null() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->wp_error->add( 'code', 'message' );

</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->assertSame( null, $this->wp_error->get_error_data( 'code' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertNull( $this->wp_error->get_error_data( 'code' ) );

</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">@@ -450,7 +450,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_add_with_code_empty_message_empty_data_should_not_add_error_data() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->wp_error->add( 'code', '' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( null, $this->wp_error->get_error_data( 'code' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertNull( $this->wp_error->get_error_data( 'code' ) );

</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">@@ -468,7 +468,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function test_add_with_code_and_message_and_empty_data_should_not_alter_stored_data() {

</span><span class="cx" style="display: block; padding: 0 10px">                $this->wp_error->add( 'code', 'message' );

</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->assertSame( null, $this->wp_error->get_error_data( 'code' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertNull( $this->wp_error->get_error_data( 'code' ) );

</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="trunktestsphpunittestshooksaddFilterphp"></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/hooks/addFilter.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/addFilter.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/hooks/addFilter.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,8 +20,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->add_filter( $tag, $callback, $priority, $accepted_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $function_index = _wp_filter_build_unique_id( $tag, $callback, $priority );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $callback, $hook->callbacks[ $priority ][ $function_index ]['function'] );

-               $this->assertEquals( $accepted_args, $hook->callbacks[ $priority ][ $function_index ]['accepted_args'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $callback, $hook->callbacks[ $priority ][ $function_index ]['function'] );

+               $this->assertSame( $accepted_args, $hook->callbacks[ $priority ][ $function_index ]['accepted_args'] );

</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_add_filter_with_object() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,8 +35,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->add_filter( $tag, $callback, $priority, $accepted_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $function_index = _wp_filter_build_unique_id( $tag, $callback, $priority );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $callback, $hook->callbacks[ $priority ][ $function_index ]['function'] );

-               $this->assertEquals( $accepted_args, $hook->callbacks[ $priority ][ $function_index ]['accepted_args'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $callback, $hook->callbacks[ $priority ][ $function_index ]['function'] );

+               $this->assertSame( $accepted_args, $hook->callbacks[ $priority ][ $function_index ]['accepted_args'] );

</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_add_filter_with_static_method() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,8 +49,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->add_filter( $tag, $callback, $priority, $accepted_args );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $function_index = _wp_filter_build_unique_id( $tag, $callback, $priority );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $callback, $hook->callbacks[ $priority ][ $function_index ]['function'] );

-               $this->assertEquals( $accepted_args, $hook->callbacks[ $priority ][ $function_index ]['accepted_args'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $callback, $hook->callbacks[ $priority ][ $function_index ]['function'] );

+               $this->assertSame( $accepted_args, $hook->callbacks[ $priority ][ $function_index ]['accepted_args'] );

</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_add_two_filters_with_same_priority() {

</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">                $hook->add_filter( $tag, array( $b, 'action' ), 5, 1 );

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->add_filter( $tag, array( $c, 'action' ), 8, 1 );

</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->assertEquals( array( 5, 8, 10 ), array_keys( $hook->callbacks ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( 5, 8, 10 ), array_keys( $hook->callbacks ) );

</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_remove_and_add() {

</span></span></pre></div>

<a id="trunktestsphpunittestshooksapplyFiltersphp"></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/hooks/applyFilters.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/applyFilters.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/hooks/applyFilters.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,8 +20,8 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $returned = $hook->apply_filters( $arg, array( $arg ) );

</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->assertEquals( $returned, $arg );

-               $this->assertEquals( 1, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $returned, $arg );

+               $this->assertSame( 1, $a->get_call_count() );

</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_apply_filters_with_multiple_calls() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,8 +38,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $returned_one = $hook->apply_filters( $arg, array( $arg ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $returned_two = $hook->apply_filters( $returned_one, array( $returned_one ) );

</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->assertEquals( $returned_two, $arg );

-               $this->assertEquals( 2, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $returned_two, $arg );

+               $this->assertSame( 2, $a->get_call_count() );

</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="trunktestsphpunittestshooksdoActionphp"></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/hooks/doAction.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/doAction.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/hooks/doAction.php        2020-09-02 00:35:36 UTC (rev 48937)

</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">                $hook->add_filter( $tag, $callback, $priority, $accepted_args );

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->do_action( array( $arg ) );

</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->assertEquals( 1, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a->get_call_count() );

</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_do_action_with_multiple_calls() {

</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">                $hook->do_action( array( $arg ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->do_action( array( $arg ) );

</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->assertEquals( 2, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, $a->get_call_count() );

</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_do_action_with_multiple_callbacks_on_same_priority() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,8 +61,8 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->add_filter( $tag, $callback_two, $priority, $accepted_args );

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->do_action( array( $arg ) );

</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->assertEquals( 1, $a->get_call_count() );

-               $this->assertEquals( 1, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a->get_call_count() );

+               $this->assertSame( 1, $a->get_call_count() );

</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_do_action_with_multiple_callbacks_on_different_priorities() {

</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">                $hook->add_filter( $tag, $callback_two, $priority + 1, $accepted_args );

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->do_action( array( $arg ) );

</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->assertEquals( 1, $a->get_call_count() );

-               $this->assertEquals( 1, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 1, $a->get_call_count() );

+               $this->assertSame( 1, $a->get_call_count() );

</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_do_action_with_no_accepted_args() {

</span></span></pre></div>

<a id="trunktestsphpunittestshooksdoAllHookphp"></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/hooks/doAllHook.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/doAllHook.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/hooks/doAllHook.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,6 +21,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->do_all_hook( $args );

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->do_all_hook( $args );

</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->assertEquals( 2, $a->get_call_count() );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 2, $a->get_call_count() );

</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="trunktestsphpunittestshookshasFilterphp"></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/hooks/hasFilter.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/hasFilter.php     2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/hooks/hasFilter.php       2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->add_filter( $tag, $callback, $priority, $accepted_args );

</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->assertEquals( $priority, $hook->has_filter( $tag, $callback ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $priority, $hook->has_filter( $tag, $callback ) );

</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_has_filter_with_object() {

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->add_filter( $tag, $callback, $priority, $accepted_args );

</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->assertEquals( $priority, $hook->has_filter( $tag, $callback ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $priority, $hook->has_filter( $tag, $callback ) );

</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_has_filter_with_static_method() {

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $hook->add_filter( $tag, $callback, $priority, $accepted_args );

</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->assertEquals( $priority, $hook->has_filter( $tag, $callback ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $priority, $hook->has_filter( $tag, $callback ) );

</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_has_filter_without_callback() {

</span></span></pre></div>

<a id="trunktestsphpunittestshookspreinitHooksphp"></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/hooks/preinitHooks.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/preinitHooks.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/hooks/preinitHooks.php    2020-09-02 00:35:36 UTC (rev 48937)

</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">                $hooks = WP_Hook::build_preinitialized_hooks( $filters );

</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->assertEquals( $priority1, $hooks[ $tag1 ]->has_filter( $tag1, '__return_false' ) );

-               $this->assertEquals( $priority2, $hooks[ $tag2 ]->has_filter( $tag2, '__return_null' ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $priority1, $hooks[ $tag1 ]->has_filter( $tag1, '__return_false' ) );

+               $this->assertSame( $priority2, $hooks[ $tag2 ]->has_filter( $tag2, '__return_null' ) );

</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="trunktestsphpunittestshooksremoveAllFiltersphp"></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/hooks/removeAllFilters.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/removeAllFilters.php      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/hooks/removeAllFilters.php        2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,6 +36,6 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertFalse( $hook->has_filter( $tag, $callback_one ) );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $hook->has_filters() );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $priority + 1, $hook->has_filter( $tag, $callback_two ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $priority + 1, $hook->has_filter( $tag, $callback_two ) );

</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="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   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/http/base.php     2020-09-02 00:35:36 UTC (rev 48937)

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 200, (int) $res['response']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 200, (int) $res['response']['code'] );

</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_redirect_on_302() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 200, (int) $res['response']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 200, (int) $res['response']['code'] );

</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">@@ -78,7 +78,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 301, (int) $res['response']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 301, (int) $res['response']['code'] );

</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">@@ -90,7 +90,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 302, (int) $res['response']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 302, (int) $res['response']['code'] );

</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_redirections_equal() {

</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">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 200, (int) $res['response']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 200, (int) $res['response']['code'] );

</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_no_head_redirections() {

</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"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 302, (int) $res['response']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 302, (int) $res['response']['code'] );

</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">@@ -126,7 +126,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 200, (int) $res['response']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 200, (int) $res['response']['code'] );

</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_redirections_greater() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +162,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 302, (int) $res['response']['code'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 302, (int) $res['response']['code'] );

</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">@@ -176,7 +176,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'PASS', $res['body'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'PASS', $res['body'] );

</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">@@ -197,7 +197,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->skipTestOnTimeout( $res );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'PASS', wp_remote_retrieve_body( $res ) );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertTrue( ! empty( $res['headers']['location'] ) );

</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,9 +252,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '', $res['body'] ); // The body should be empty.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( '', $res['body'] ); // The body should be empty.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $size, $res['headers']['content-length'] );   // Check the headers are returned (and the size is the same).

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters.

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertStringStartsWith( get_temp_dir(), $res['filename'] ); // Check it's saving within the temp directory.

</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">@@ -281,7 +281,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters.

</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">@@ -304,7 +304,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $res );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotWPError( $res );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $size, strlen( $res['body'] ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $size, strlen( $res['body'] ) );

</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">@@ -320,7 +320,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $res = wp_remote_post( add_query_arg( 'response_code', $response_code, $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->assertEquals( $method, wp_remote_retrieve_body( $res ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $method, wp_remote_retrieve_body( $res ) );

</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 data_post_redirect_to_method_300() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,7 +367,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $res = wp_remote_get( $url, $args );

</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->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'PASS', wp_remote_retrieve_body( $res ) );

</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">@@ -409,7 +409,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $res = wp_remote_get( $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->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'PASS', wp_remote_retrieve_body( $res ) );

</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">@@ -424,7 +424,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $res = wp_remote_get( $url );

</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->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'PASS', wp_remote_retrieve_body( $res ) );

</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="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      2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/http/functions.php        2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,9 +25,9 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $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->assertEquals( 'image/jpeg', $headers['content-type'] );

-               $this->assertEquals( '40148', $headers['content-length'] );

-               $this->assertEquals( '200', wp_remote_retrieve_response_code( $response ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'image/jpeg', $headers['content-type'] );

+               $this->assertSame( '40148', $headers['content-length'] );

+               $this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );

</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_head_redirect() {

</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">                $response = wp_remote_head( $url );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $response );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '301', wp_remote_retrieve_response_code( $response ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 301, wp_remote_retrieve_response_code( $response ) );

</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_head_404() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $response = wp_remote_head( $url );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $this->skipTestOnTimeout( $response );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( '404', wp_remote_retrieve_response_code( $response ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 404, wp_remote_retrieve_response_code( $response ) );

</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_get_request() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,9 +59,9 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertInternalType( 'array', $response );

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Should return the same headers as a HEAD request.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'image/jpeg', $headers['content-type'] );

-               $this->assertEquals( '40148', $headers['content-length'] );

-               $this->assertEquals( '200', wp_remote_retrieve_response_code( $response ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'image/jpeg', $headers['content-type'] );

+               $this->assertSame( '40148', $headers['content-length'] );

+               $this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );

</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_get_redirect() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,9 +75,9 @@

</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 class="cx" style="display: block; padding: 0 10px">                // Should return the same headers as a HEAD request.

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( 'image/jpeg', $headers['content-type'] );

-               $this->assertEquals( '40148', $headers['content-length'] );

-               $this->assertEquals( '200', wp_remote_retrieve_response_code( $response ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( 'image/jpeg', $headers['content-type'] );

+               $this->assertSame( '40148', $headers['content-length'] );

+               $this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );

</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_get_redirect_limit_exceeded() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,7 +196,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check the host_only flag in the resulting WP_Http_Cookie.

</span><span class="cx" style="display: block; padding: 0 10px">                $cookie = wp_remote_retrieve_cookie( $response, 'test' );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $cookie->domain, 'wordpress.org' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $cookie->domain, 'wordpress.org' );

</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertFalse( $cookie->host_only, 'host-only flag not set' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Regurgitate (Requests_Cookie -> WP_Http_Cookie -> Requests_Cookie).

</span></span></pre></div>

<a id="trunktestsphpunittestshttphttpphp"></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/http.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/http.php   2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/http/http.php     2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_make_absolute_url( $relative_url, $absolute_url, $expected ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = WP_Http::make_absolute_url( $relative_url, $absolute_url );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function make_absolute_url_testcases() {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_parse_url( $url, $expected ) {

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = wp_parse_url( $url );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $actual );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $actual );

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        function parse_url_testcases() {

</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">         */

</span><span class="cx" style="display: block; padding: 0 10px">        function test_wp_parse_url_with_default_component() {

</span><span class="cx" style="display: block; padding: 0 10px">                $actual = wp_parse_url( self::FULL_TEST_URL, -1 );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals(

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame(

</ins><span class="cx" style="display: block; padding: 0 10px">                         array(

</span><span class="cx" style="display: block; padding: 0 10px">                                'scheme'   => 'http',

</span><span class="cx" style="display: block; padding: 0 10px">                                'host'     => 'host.name',

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +271,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // This primes the `$wp_header_to_desc` global:

</span><span class="cx" style="display: block; padding: 0 10px">                get_status_header_desc( 200 );

</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->assertEquals( array_keys( $wp_header_to_desc ), array_values( $constants ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array_keys( $wp_header_to_desc ), array_values( $constants ) );

</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="trunktestsphpunittestshttpremoteRetrieveHeadersphp"></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/remoteRetrieveHeaders.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/remoteRetrieveHeaders.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/http/remoteRetrieveHeaders.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $response = array( 'headers' => $headers );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $result = wp_remote_retrieve_headers( $response );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $headers, $result );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $headers, $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">@@ -23,7 +23,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $response = new WP_Error( 'Some error' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $result = wp_remote_retrieve_headers( $response );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array(), $result );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), $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">@@ -33,6 +33,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $response = array( 'no_headers' => 'set' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $result = wp_remote_retrieve_headers( $response );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( array(), $result );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array(), $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="trunktestsphpunittestsimagebasephp"></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/base.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/base.php  2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/image/base.php    2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                $colors = imagecolorsforindex( $im, $rgb );

</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->assertEquals( $alpha, $colors['alpha'] );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $alpha, $colors['alpha'] );

</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">@@ -62,7 +62,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                $im    = new Imagick( $image_path );

</span><span class="cx" style="display: block; padding: 0 10px">                $pixel = $im->getImagePixelColor( $point[0], $point[1] );

</span><span class="cx" style="display: block; padding: 0 10px">                $color = $pixel->getColorValue( imagick::COLOR_ALPHA );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEquals( $expected, $color );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $expected, $color );

</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">@@ -85,7 +85,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">                        $detected_height = $image_size[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->assertEquals( $width, $detected_width );

-               $this->assertEquals( $height, $detected_height );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( $width, $detected_width );

+               $this->assertSame( $height, $detected_height );

</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="trunktestsphpunittestsimagedimensionsphp"></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/dimensions.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/dimensions.php    2020-09-01 19:20:53 UTC (rev 48936)

+++ trunk/tests/phpunit/tests/image/dimensions.php      2020-09-02 00:35:36 UTC (rev 48937)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,12 +10,12 @@

</span><span class="cx" style="display: block; padding: 0 10px">                // Landscape: resize 640x480 to fit 400x400: 400x300.

</span><span class="cx" style="display: block; padding: 0 10px">                $out = image_resize_dimensions( 640, 480, 400, 400, false );